Move NeoForge shims out of exported packages

src/main/java/com/vinlanx/explosionoverhaul/BlurTestPacket.java

@@ -8,7 +8,7 @@ import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class BlurTestPacket {
     private final int durationSeconds;

src/main/java/com/vinlanx/explosionoverhaul/CameraShakeConcussionPacket.java

@@ -8,7 +8,7 @@ import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class CameraShakeConcussionPacket {
     private final int durationSeconds;

src/main/java/com/vinlanx/explosionoverhaul/CameraShakePacket.java

@@ -7,8 +7,8 @@ import com.vinlanx.explosionoverhaul.client.ClientEffects;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class CameraShakePacket {
     private final float intensity;

src/main/java/com/vinlanx/explosionoverhaul/ClientSoundHandler.java

@@ -4,7 +4,7 @@
 package com.vinlanx.explosionoverhaul;
 
 import net.neoforged.neoforge.client.event.sound.PlaySoundEvent;
-import net.neoforged.neoforge.event.TickEvent;
+import com.vinlanx.explosionoverhaul.compat.TickEvent;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 

src/main/java/com/vinlanx/explosionoverhaul/ExplosionVisualsPacket.java

@@ -7,7 +7,7 @@ import com.vinlanx.explosionoverhaul.client.ClientEffects;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class ExplosionVisualsPacket {
     private final Vec3 position;

src/main/java/com/vinlanx/explosionoverhaul/FlashEffectPacket.java

@@ -8,8 +8,8 @@ import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class FlashEffectPacket {
     private final Vec3 explosionPos;

src/main/java/com/vinlanx/explosionoverhaul/LowPassTestPacket.java

@@ -8,7 +8,7 @@ import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class LowPassTestPacket {
     private final int durationSeconds;

src/main/java/com/vinlanx/explosionoverhaul/OpenALTogglePacket.java

@@ -10,8 +10,8 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class OpenALTogglePacket {
     private final String target;

src/main/java/com/vinlanx/explosionoverhaul/PacketHandler.java

@@ -27,8 +27,8 @@ import com.vinlanx.explosionoverhaul.StartConcussionPacket;
 import com.vinlanx.explosionoverhaul.SuppressExplosionSoundPacket;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
-import net.neoforged.neoforge.network.NetworkRegistry;
-import net.neoforged.neoforge.network.simple.SimpleChannel;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkRegistry;
+import com.vinlanx.explosionoverhaul.compat.network.simple.SimpleChannel;
 
 public class PacketHandler {
     private static final String PROTOCOL_VERSION = "1";

src/main/java/com/vinlanx/explosionoverhaul/PlayTrackedSoundPacket.java

@@ -9,8 +9,8 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class PlayTrackedSoundPacket {
     private final Vec3 explosionPos;

src/main/java/com/vinlanx/explosionoverhaul/ScanControlPacket.java

@@ -7,7 +7,7 @@ import com.vinlanx.explosionoverhaul.BlockIndexManager;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class ScanControlPacket {
     private final boolean startScan;

src/main/java/com/vinlanx/explosionoverhaul/ScanInfoPacket.java

@@ -6,7 +6,7 @@ package com.vinlanx.explosionoverhaul;
 import com.vinlanx.explosionoverhaul.ScanInfoHUD;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class ScanInfoPacket {
     private final boolean show;

src/main/java/com/vinlanx/explosionoverhaul/ScanLoadControlPacket.java

@@ -7,7 +7,7 @@ import com.vinlanx.explosionoverhaul.BlockIndexManager;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class ScanLoadControlPacket {
     private final boolean loadExisting;

src/main/java/com/vinlanx/explosionoverhaul/ScanLoadPromptPacket.java

@@ -6,7 +6,7 @@ package com.vinlanx.explosionoverhaul;
 import com.vinlanx.explosionoverhaul.ScanLoadPromptHUD;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class ScanLoadPromptPacket {
     private final boolean showPrompt;

src/main/java/com/vinlanx/explosionoverhaul/ScanProgressPacket.java

@@ -6,7 +6,7 @@ package com.vinlanx.explosionoverhaul;
 import com.vinlanx.explosionoverhaul.ScanProgressHUD;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class ScanProgressPacket {
     private final int totalChunks;

src/main/java/com/vinlanx/explosionoverhaul/ScanPromptPacket.java

@@ -6,7 +6,7 @@ package com.vinlanx.explosionoverhaul;
 import com.vinlanx.explosionoverhaul.ScanPromptHUD;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class ScanPromptPacket {
     private final boolean showPrompt;

src/main/java/com/vinlanx/explosionoverhaul/SpawnAmbientCaveDustPacket.java

@@ -7,8 +7,8 @@ import com.vinlanx.explosionoverhaul.client.ClientEffects;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class SpawnAmbientCaveDustPacket {
     private final float power;

src/main/java/com/vinlanx/explosionoverhaul/SpawnCustomGlowPacket.java

@@ -11,8 +11,8 @@ import net.minecraft.core.particles.ParticleOptions;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class SpawnCustomGlowPacket {
     private final Vec3 pos;

src/main/java/com/vinlanx/explosionoverhaul/SpawnDustCloudPacket.java

@@ -8,8 +8,8 @@ import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class SpawnDustCloudPacket {
     private final Vec3 position;

src/main/java/com/vinlanx/explosionoverhaul/SpawnLineSparksPacket.java

@@ -8,8 +8,8 @@ import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class SpawnLineSparksPacket {
     private final Vec3 position;

src/main/java/com/vinlanx/explosionoverhaul/SpawnMistCloudPacket.java

@@ -8,8 +8,8 @@ import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class SpawnMistCloudPacket {
     private final Vec3 position;

src/main/java/com/vinlanx/explosionoverhaul/SpawnShockwavePacket.java

@@ -8,8 +8,8 @@ import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class SpawnShockwavePacket {
     private final Vec3 position;

src/main/java/com/vinlanx/explosionoverhaul/StartConcussionPacket.java

@@ -7,8 +7,8 @@ import com.vinlanx.explosionoverhaul.client.ConcussionAudioEffect;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class StartConcussionPacket {
     private final float power;

src/main/java/com/vinlanx/explosionoverhaul/SuppressExplosionSoundPacket.java

@@ -7,8 +7,8 @@ import com.vinlanx.explosionoverhaul.ClientSoundHandler;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
+import com.vinlanx.explosionoverhaul.compat.DistExecutor;
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 
 public class SuppressExplosionSoundPacket {
     private final float power;

src/main/java/com/vinlanx/explosionoverhaul/client/FirstTimeSetupHandler.java

@@ -10,7 +10,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.neoforge.event.TickEvent;
+import com.vinlanx.explosionoverhaul.compat.TickEvent;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.common.EventBusSubscriber;

src/main/java/com/vinlanx/explosionoverhaul/client/IntroMusicTickHandler.java

@@ -5,7 +5,7 @@ package com.vinlanx.explosionoverhaul.client;
 
 import com.vinlanx.explosionoverhaul.client.IntroMusicManager;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.neoforge.event.TickEvent;
+import com.vinlanx.explosionoverhaul.compat.TickEvent;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.common.EventBusSubscriber;

src/main/java/com/vinlanx/explosionoverhaul/compat/DistExecutor.java

@@ -1,4 +1,4 @@
-package net.neoforged.fml;
+package com.vinlanx.explosionoverhaul.compat;
 
 import java.util.function.Supplier;
 import net.neoforged.api.distmarker.Dist;

src/main/java/com/vinlanx/explosionoverhaul/compat/TickEvent.java

@@ -1,4 +1,4 @@
-package net.neoforged.neoforge.event;
+package com.vinlanx.explosionoverhaul.compat;
 
 import net.minecraft.server.MinecraftServer;
 import net.neoforged.neoforge.server.ServerLifecycleHooks;

src/main/java/com/vinlanx/explosionoverhaul/compat/network/NetworkEvent.java

@@ -1,4 +1,4 @@
-package net.neoforged.neoforge.network;
+package com.vinlanx.explosionoverhaul.compat.network;
 
 import net.minecraft.server.level.ServerPlayer;
 

src/main/java/com/vinlanx/explosionoverhaul/compat/network/NetworkRegistry.java

@@ -1,9 +1,9 @@
-package net.neoforged.neoforge.network;
+package com.vinlanx.explosionoverhaul.compat.network;
 
+import com.vinlanx.explosionoverhaul.compat.network.simple.SimpleChannel;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import net.minecraft.resources.ResourceLocation;
-import net.neoforged.neoforge.network.simple.SimpleChannel;
 
 public final class NetworkRegistry {
     private NetworkRegistry() {

src/main/java/com/vinlanx/explosionoverhaul/compat/network/simple/SimpleChannel.java

@@ -1,10 +1,10 @@
-package net.neoforged.neoforge.network.simple;
+package com.vinlanx.explosionoverhaul.compat.network.simple;
 
+import com.vinlanx.explosionoverhaul.compat.network.NetworkEvent;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import net.minecraft.network.FriendlyByteBuf;
-import net.neoforged.neoforge.network.NetworkEvent;
 
 public class SimpleChannel {
     public <MSG> void registerMessage(int id, Class<MSG> messageType, BiConsumer<MSG, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, MSG> decoder, BiConsumer<MSG, Supplier<NetworkEvent.Context>> handler) {