Fix neoforged paths

src/main/java/appeng/api/config/FuzzyMode.java

@@ -28,7 +28,7 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.util.StringRepresentable;
-import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+import appeng.util.neoforge.NeoForgeStreamCodecs;
 
 public enum FuzzyMode implements StringRepresentable {
     /**

src/main/java/appeng/api/util/AEColor.java

@@ -33,7 +33,7 @@
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.util.StringRepresentable;
 import net.minecraft.world.item.DyeColor;
-import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+import appeng.util.neoforge.NeoForgeStreamCodecs;
 
 /**
  * List of all colors supported by AE, their names, and various colors for display.

src/main/java/appeng/block/crafting/PushDirection.java

@@ -8,7 +8,7 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.util.StringRepresentable;
-import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+import appeng.util.neoforge.NeoForgeStreamCodecs;
 
 /**
  * Extends {@link Direction} with an 'all' key.

src/main/java/appeng/client/gui/AEBaseScreen.java

@@ -50,7 +50,7 @@
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.behaviors.ContainerItemStrategies;
 import appeng.api.behaviors.EmptyingAction;
@@ -655,15 +655,15 @@ && getEmptyingAction(slot, menu.getCarried()) != null) {
             }
 
             final InventoryActionPacket p = new InventoryActionPacket(action, slotIdx, 0);
-            PacketDistributor.sendToServer(p);
+            ClientPlayNetworking.send(p);
 
             return;
         }
 
         if (slot != null && InputConstants.isKeyDown(getMinecraft().getWindow().getWindow(), GLFW.GLFW_KEY_SPACE)) {
             int slotNum = slot.index;
             final InventoryActionPacket p = new InventoryActionPacket(InventoryAction.MOVE_REGION, slotNum, 0);
-            PacketDistributor.sendToServer(p);
+            ClientPlayNetworking.send(p);
             return;
         }
 
@@ -741,7 +741,7 @@ protected boolean checkHotbarKeyPressed(int keyCode, int scanCode) {
                             if (s.slot == j
                                     && s.container == this.menu.getPlayerInventory()) {
                                 ServerboundPacket message = new SwapSlotsPacket(s.index, theSlot.index);
-                                PacketDistributor.sendToServer(message);
+                                ClientPlayNetworking.send(message);
                                 return true;
                             }
                         }

src/main/java/appeng/client/gui/implementations/AESubScreen.java

@@ -18,10 +18,10 @@
 
 package appeng.client.gui.implementations;
 
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.network.chat.Component;
-import net.neoforged.neoforge.network.PacketDistributor;
 
 import appeng.client.gui.Icon;
 import appeng.client.gui.WidgetContainer;
@@ -55,7 +55,7 @@ public static void addBackButton(ISubMenu subMenu, String id, WidgetContainer wi
 
     public static void goBack() {
         ServerboundPacket message = SwitchGuisPacket.returnToParentMenu();
-        PacketDistributor.sendToServer(message);
+        ClientPlayNetworking.send(message);
     }
 
 }

src/main/java/appeng/client/gui/implementations/PatternProviderScreen.java

@@ -20,7 +20,7 @@
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.config.LockCraftingMode;
 import appeng.api.config.Settings;
@@ -78,6 +78,6 @@ protected void updateBeforeRender() {
     private void selectNextPatternProviderMode() {
         final boolean backwards = isHandlingRightClick();
         ServerboundPacket message = new ConfigButtonPacket(Settings.PATTERN_ACCESS_TERMINAL, backwards);
-        PacketDistributor.sendToServer(message);
+        ClientPlayNetworking.send(message);
     }
 }

src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java

@@ -28,7 +28,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
-import net.neoforged.neoforge.common.util.ItemStackMap;
+import appeng.util.neoforge.util.ItemStackMap;
 
 import appeng.client.render.cablebus.FacadeBuilder;
 import appeng.items.parts.FacadeItem;

src/main/java/appeng/core/network/clientbound/CompassResponsePacket.java

@@ -11,7 +11,7 @@
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ChunkPos;
-import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+import appeng.util.neoforge.NeoForgeStreamCodecs;
 
 import appeng.core.network.ClientboundPacket;
 import appeng.core.network.CustomAppEngPayload;

src/main/java/appeng/core/network/clientbound/ExportedGridContent.java

@@ -20,7 +20,7 @@
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.entity.player.Player;
-import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+import appeng.util.neoforge.NeoForgeStreamCodecs;
 
 import appeng.core.network.ClientboundPacket;
 import appeng.core.network.CustomAppEngPayload;

src/main/java/appeng/core/network/serverbound/RequestClosestMeteoritePacket.java

@@ -9,7 +9,7 @@
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.ChunkPos;
-import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+import appeng.util.neoforge.NeoForgeStreamCodecs;
 
 import appeng.core.network.CustomAppEngPayload;
 import appeng.core.network.ServerboundPacket;

src/main/java/appeng/datagen/AE2DataGenerators.java

@@ -22,7 +22,7 @@
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.registries.Registries;
 import net.minecraftforge.common.data.ExistingFileHelper;
-import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider;
+import appeng.util.neoforge.data.DatapackBuiltinEntriesProvider;
 
 import appeng.core.definitions.AEDamageTypes;
 import appeng.datagen.providers.advancements.AdvancementGenerator;

src/main/java/appeng/hooks/BlockAttackHook.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.parts.IPartHost;
 import appeng.core.network.ServerboundPacket;
@@ -94,14 +94,14 @@ private static boolean onBlockAttackedOnClient(Player player, Level level, Block
 
             if (activated) {
                 ServerboundPacket message = new PartLeftClickPacket(hitResult, alternateUseMode);
-                PacketDistributor.sendToServer(message);
+                ClientPlayNetworking.send(message);
                 // Do not perform the default action (of spawning break particles and breaking the block)
                 return true;
             }
         } else if (p.facade != null) {
             if (p.facade.onClicked(player, localPos)) {
                 ServerboundPacket message = new PartLeftClickPacket(hitResult, false);
-                PacketDistributor.sendToServer(message);
+                ClientPlayNetworking.send(message);
                 // Do not perform the default action (of spawning break particles and breaking the block)
                 return true;
             }

src/main/java/appeng/hooks/ColorApplicatorPickColorHook.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.BlockHitResult;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.implementations.blockentities.IColorableBlockEntity;
 import appeng.core.definitions.AEItems;
@@ -23,7 +23,7 @@ public static boolean onPickColor(Player player, BlockHitResult hitResult) {
         var be = player.level().getBlockEntity(hitResult.getBlockPos());
         if (be instanceof IColorableBlockEntity colorableBlockEntity) {
             ServerboundPacket message = new ColorApplicatorSelectColorPacket(colorableBlockEntity.getColor());
-            PacketDistributor.sendToServer(message);
+            ClientPlayNetworking.send(message);
             return true;
         }
 

src/main/java/appeng/hooks/CompassManager.java

@@ -22,7 +22,7 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.ChunkPos;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 
@@ -83,7 +83,7 @@ public BlockPos getClosestMeteorite(ChunkPos chunkPos, boolean prefetch) {
 
         if (request) {
             this.requests.put(chunkPos.toLong(), new CachedResult(result, now));
-            PacketDistributor.sendToServer(new RequestClosestMeteoritePacket(chunkPos));
+            ClientPlayNetworking.send(new RequestClosestMeteoritePacket(chunkPos));
         }
 
         // Prefetch meteor positions from the server for adjacent blocks, so they are

src/main/java/appeng/integration/modules/itemlists/CraftingHelper.java

@@ -9,7 +9,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.stacks.AEItemKey;
 import appeng.core.AELog;
@@ -41,7 +41,7 @@ public static void performTransfer(CraftingTermMenu menu, @Nullable ResourceLoca
         }
 
         ServerboundPacket message = new FillCraftingGridFromRecipePacket(recipeId, templateItems, craftMissing);
-        PacketDistributor.sendToServer(message);
+        ClientPlayNetworking.send(message);
     }
 
     private static NonNullList<ItemStack> findGoodTemplateItems(Recipe<?> recipe, MEStorageMenu menu) {

src/main/java/appeng/integration/modules/itemlists/EncodingHelper.java

@@ -13,7 +13,7 @@
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.RecipeType;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.stacks.AEItemKey;
 import appeng.api.stacks.AEKey;
@@ -78,7 +78,7 @@ private static void encodeBestMatchingStacksIntoSlots(List<List<GenericStack>> p
                     : ItemStack.EMPTY;
             ServerboundPacket message = new InventoryActionPacket(
                     InventoryAction.SET_FILTER, slot.index, stack);
-            PacketDistributor.sendToServer(message);
+            ClientPlayNetworking.send(message);
         }
     }
 
@@ -166,14 +166,14 @@ public static void encodeCraftingRecipe(PatternEncodingTermMenu menu,
             ItemStack encodedInput = encodedInputs.get(i);
             ServerboundPacket message = new InventoryActionPacket(
                     InventoryAction.SET_FILTER, menu.getCraftingGridSlots()[i].index, encodedInput);
-            PacketDistributor.sendToServer(message);
+            ClientPlayNetworking.send(message);
         }
 
         // Clear out the processing outputs
         for (var outputSlot : menu.getProcessingOutputSlots()) {
             ServerboundPacket message = new InventoryActionPacket(
                     InventoryAction.SET_FILTER, outputSlot.index, ItemStack.EMPTY);
-            PacketDistributor.sendToServer(message);
+            ClientPlayNetworking.send(message);
         }
 
     }

src/main/java/appeng/items/tools/MemoryCardItem.java

@@ -43,7 +43,7 @@
 import net.minecraft.world.item.component.DyedItemColor;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
-import net.neoforged.neoforge.common.util.ItemStackMap;
+import appeng.util.neoforge.util.ItemStackMap;
 
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap;

src/main/java/appeng/menu/AEBaseMenu.java

@@ -41,7 +41,7 @@
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import it.unimi.dsi.fastutil.shorts.ShortOpenHashSet;
 import it.unimi.dsi.fastutil.shorts.ShortSet;
@@ -940,7 +940,7 @@ protected final <T> void sendClientAction(String action, T arg) {
         }
 
         ServerboundPacket message = new GuiActionPacket(containerId, clientAction.name, jsonPayload);
-        PacketDistributor.sendToServer(message);
+        ClientPlayNetworking.send(message);
     }
 
     /**

src/main/java/appeng/menu/interfaces/KeyTypeSelectionMenu.java

@@ -8,7 +8,7 @@
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.stacks.AEKeyType;
 import appeng.api.util.KeyTypeSelection;
@@ -37,7 +37,7 @@ public interface KeyTypeSelectionMenu {
     default void selectKeyType(AEKeyType keyType, boolean enabled) {
         // Send to server
         ServerboundPacket message = new SelectKeyTypePacket(keyType, enabled);
-        PacketDistributor.sendToServer(message);
+        ClientPlayNetworking.send(message);
         // Update client
         getClientKeyTypeSelection().keyTypes().put(keyType, enabled);
     }

src/main/java/appeng/menu/me/common/MEStorageMenu.java

@@ -34,7 +34,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Ingredient;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.shorts.ShortSet;
@@ -365,7 +365,7 @@ protected final boolean canInteractWithGrid() {
     public final void handleInteraction(long serial, InventoryAction action) {
         if (isClientSide()) {
             ServerboundPacket message = new MEInteractionPacket(containerId, serial, action);
-            PacketDistributor.sendToServer(message);
+            ClientPlayNetworking.send(message);
             return;
         }
 

src/main/java/appeng/menu/me/crafting/CraftAmountMenu.java

@@ -26,7 +26,7 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.Level;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.networking.crafting.CalculationStrategy;
 import appeng.api.stacks.AEKey;
@@ -110,7 +110,7 @@ private void setWhatToCraft(AEKey whatToCraft, int initialAmount) {
     public void confirm(int amount, boolean craftMissingAmount, boolean autoStart) {
         if (!isServerSide()) {
             ServerboundPacket message = new ConfirmAutoCraftPacket(amount, craftMissingAmount, autoStart);
-            PacketDistributor.sendToServer(message);
+            ClientPlayNetworking.send(message);
             return;
         }
 

src/main/java/appeng/menu/me/items/CraftingTermMenu.java

@@ -30,7 +30,7 @@
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.*;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 
@@ -158,7 +158,7 @@ public void clearCraftingGrid() {
         Preconditions.checkState(isClientSide());
         CraftingMatrixSlot slot = craftingSlots[0];
         var p = new InventoryActionPacket(InventoryAction.MOVE_REGION, slot.index, 0);
-        PacketDistributor.sendToServer(p);
+        ClientPlayNetworking.send(p);
     }
 
     @Override

src/main/java/appeng/menu/slot/FakeSlot.java

@@ -20,7 +20,7 @@
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.neoforged.neoforge.network.PacketDistributor;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 
 import appeng.api.config.Actionable;
 import appeng.api.inventories.InternalInventory;
@@ -76,7 +76,7 @@ public boolean canSetFilterTo(ItemStack stack) {
     public void setFilterTo(ItemStack itemStack) {
         ServerboundPacket message = new InventoryActionPacket(InventoryAction.SET_FILTER,
                 index, itemStack);
-        PacketDistributor.sendToServer(message);
+        ClientPlayNetworking.send(message);
     }
 
     public void increase(ItemStack is) {

src/main/java/appeng/recipes/entropy/EntropyRecipe.java

@@ -47,7 +47,7 @@
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
-import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+import appeng.util.neoforge.NeoForgeStreamCodecs;
 
 import appeng.core.AppEng;
 import appeng.items.tools.powered.EntropyManipulatorItem;

src/main/java/appeng/recipes/handlers/InscriberRecipe.java

@@ -32,7 +32,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.*;
 import net.minecraft.world.level.Level;
-import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs;
+import appeng.util.neoforge.NeoForgeStreamCodecs;
 
 import appeng.core.AppEng;
 import appeng.recipes.AERecipeTypes;