Initial work to support 1.20.4

Still needs a lot of work, but the gradle stuff is prepared for neo
IntelligenceModding · Apr 15, 2024 · 764a54d · 764a54d
1 parent e62beee
commit 764a54d
Show file tree

Hide file tree

Showing 97 changed files with 317 additions and 441 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/gradle.properties b/gradle.properties
@@ -4,14 +4,13 @@ org.gradle.logging.level=info
 
 # Minecraft related
 mod_id=advancedperipherals
-minecraft_version=1.20.1
-neo_version=47.1.99
-loader_version=47
+minecraft_version=1.20.4
+neo_version=20.4.231
+loader_version=20
 mod_version=0.7.40r
 release_type=release
-mappings_channel=official
-#mappings_version=2022.11.27-1.19.2
-mappings_version=1.20.1
+neogradle.subsystems.parchment.minecraftVersion=1.20.4
+neogradle.subsystems.parchment.mappingsVersion=2024.04.14
 jb_annotations=21.0.1
 
 # Test dependencies
@@ -22,7 +21,7 @@ kotlinx_coroutines_version=1.6.0-RC3
 ttoolkit_version=0.1.3
 
 # Mod dependencies
-cc_version=1.110.0
+cc_version=1.110.2
 curios_version=5.2.0+1.20.1
 minecolonies_version=1.20.1-1.1.472-BETA
 appliedenergistics_version=15.0.9-beta

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -6,17 +6,10 @@ pluginManagement {
             name = 'NeoForged'
             url = 'https://maven.neoforged.net/releases'
 
-            content {
-                includeGroup("net.minecraftforge")
-                includeGroup("net.neoforged.gradle")
-                includeGroup("net.neoforged")
-                includeGroup("org.spongepowered.mixin")
-                includeGroup("org.spongepowered")
-            }
         }
     }
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
diff --git a/src/main/java/de/srendi/advancedperipherals/APCreativeTab.java b/src/main/java/de/srendi/advancedperipherals/APCreativeTab.java
@@ -8,7 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.registries.RegistryObject;
+import net.neoforged.registries.RegistryObject;
 
 import java.util.Collection;
 import java.util.Set;

diff --git a/src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java b/src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java
@@ -6,12 +6,12 @@
 
 import de.srendi.advancedperipherals.network.APNetworking;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.neoforged.common.MinecraftForge;
+import net.neoforged.eventbus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/src/main/java/de/srendi/advancedperipherals/client/ClientRegistry.java b/src/main/java/de/srendi/advancedperipherals/client/ClientRegistry.java
@@ -9,12 +9,12 @@
 import net.minecraft.client.gui.screens.MenuScreens;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.ModelEvent;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.client.event.ModelEvent;
+import net.neoforged.client.event.RegisterKeyMappingsEvent;
+import net.neoforged.eventbus.api.SubscribeEvent;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 
 @Mod.EventBusSubscriber(modid = AdvancedPeripherals.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class ClientRegistry {

diff --git a/src/main/java/de/srendi/advancedperipherals/client/KeyBindings.java b/src/main/java/de/srendi/advancedperipherals/client/KeyBindings.java
@@ -1,7 +1,7 @@
 package de.srendi.advancedperipherals.client;
 
 import net.minecraft.client.KeyMapping;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
+import net.neoforged.client.event.RegisterKeyMappingsEvent;
 import org.lwjgl.glfw.GLFW;
 
 public class KeyBindings {

diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/APAddons.java b/src/main/java/de/srendi/advancedperipherals/common/addons/APAddons.java
@@ -2,10 +2,10 @@
 
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.addons.refinedstorage.RefinedStorage;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
+import net.neoforged.eventbus.api.SubscribeEvent;
+import net.neoforged.fml.ModList;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
 
 @Mod.EventBusSubscriber(modid = AdvancedPeripherals.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class APAddons {

diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java b/src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java
@@ -30,12 +30,12 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
-import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.capability.IFluidHandler;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.neoforged.common.capabilities.ForgeCapabilities;
+import net.neoforged.common.util.LazyOptional;
+import net.neoforged.fluids.FluidStack;
+import net.neoforged.fluids.capability.IFluidHandler;
+import net.neoforged.items.IItemHandler;
+import net.neoforged.registries.ForgeRegistries;
 import org.apache.logging.log4j.Level;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...n/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MeFluidHandler.java b/...n/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MeFluidHandler.java
@@ -7,7 +7,7 @@
 import de.srendi.advancedperipherals.common.util.Pair;
 import de.srendi.advancedperipherals.common.util.inventory.FluidFilter;
 import de.srendi.advancedperipherals.common.util.inventory.IStorageSystemFluidHandler;
-import net.minecraftforge.fluids.FluidStack;
+import net.neoforged.fluids.FluidStack;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/...edperipherals/common/addons/computercraft/integrations/IntegrationPeripheralProvider.java b/...edperipherals/common/addons/computercraft/integrations/IntegrationPeripheralProvider.java
@@ -12,7 +12,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.NoteBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.util.LazyOptional;
+import net.neoforged.common.util.LazyOptional;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Comparator;

diff --git a/...di/advancedperipherals/common/addons/computercraft/integrations/NoteBlockIntegration.java b/...di/advancedperipherals/common/addons/computercraft/integrations/NoteBlockIntegration.java
@@ -24,7 +24,7 @@ public String getType() {
     @LuaFunction(mainThread = true)
     public final int changeNote() {
         BlockState state = world.getBlockState(pos);
-        int newNote = net.minecraftforge.common.ForgeHooks.onNoteChange(world, pos, state, state.getValue(NoteBlock.NOTE), state.cycle(NoteBlock.NOTE).getValue(NoteBlock.NOTE));
+        int newNote = net.neoforged.common.ForgeHooks.onNoteChange(world, pos, state, state.getValue(NoteBlock.NOTE), state.cycle(NoteBlock.NOTE).getValue(NoteBlock.NOTE));
         if (newNote == -1) return -1;
         state = state.setValue(NoteBlock.NOTE, newNote);
         world.setBlock(pos, state, 3);

diff --git a/...e/srendi/advancedperipherals/common/addons/computercraft/operations/AutomataCoreTier.java b/...e/srendi/advancedperipherals/common/addons/computercraft/operations/AutomataCoreTier.java
@@ -1,7 +1,7 @@
 package de.srendi.advancedperipherals.common.addons.computercraft.operations;
 
 import de.srendi.advancedperipherals.lib.metaphysics.IAutomataCoreTier;
-import net.minecraftforge.common.ForgeConfigSpec;
+import net.neoforged.common.ForgeConfigSpec;
 
 public enum AutomataCoreTier implements IAutomataCoreTier {
     TIER1(2, 2),

diff --git a/...rendi/advancedperipherals/common/addons/computercraft/operations/SimpleFreeOperation.java b/...rendi/advancedperipherals/common/addons/computercraft/operations/SimpleFreeOperation.java
@@ -1,7 +1,7 @@
 package de.srendi.advancedperipherals.common.addons.computercraft.operations;
 
 import de.srendi.advancedperipherals.lib.peripherals.IPeripheralOperation;
-import net.minecraftforge.common.ForgeConfigSpec;
+import net.neoforged.common.ForgeConfigSpec;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...de/srendi/advancedperipherals/common/addons/computercraft/operations/SingleOperation.java b/...de/srendi/advancedperipherals/common/addons/computercraft/operations/SingleOperation.java
@@ -1,7 +1,7 @@
 package de.srendi.advancedperipherals.common.addons.computercraft.operations;
 
 import de.srendi.advancedperipherals.lib.peripherals.IPeripheralOperation;
-import net.minecraftforge.common.ForgeConfigSpec;
+import net.neoforged.common.ForgeConfigSpec;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...de/srendi/advancedperipherals/common/addons/computercraft/operations/SphereOperation.java b/...de/srendi/advancedperipherals/common/addons/computercraft/operations/SphereOperation.java
@@ -2,7 +2,7 @@
 
 import com.google.common.math.IntMath;
 import de.srendi.advancedperipherals.lib.peripherals.IPeripheralOperation;
-import net.minecraftforge.common.ForgeConfigSpec;
+import net.neoforged.common.ForgeConfigSpec;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...e/srendi/advancedperipherals/common/addons/computercraft/owner/TileEntityFuelAbility.java b/...e/srendi/advancedperipherals/common/addons/computercraft/owner/TileEntityFuelAbility.java
@@ -3,7 +3,7 @@
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.lib.peripherals.IPeripheralTileEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.neoforged.common.capabilities.ForgeCapabilities;
 import org.jetbrains.annotations.NotNull;
 
 public class TileEntityFuelAbility<T extends BlockEntity & IPeripheralTileEntity> extends FuelAbility<BlockEntityPeripheralOwner<T>> {

diff --git a/...ndi/advancedperipherals/common/addons/computercraft/peripheral/BlockReaderPeripheral.java b/...ndi/advancedperipherals/common/addons/computercraft/peripheral/BlockReaderPeripheral.java
@@ -11,7 +11,7 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.neoforged.registries.ForgeRegistries;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java b/.../srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java
@@ -27,7 +27,7 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.server.ServerLifecycleHooks;
+import net.neoforged.server.ServerLifecycleHooks;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;

diff --git a/...e/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java b/...e/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java
@@ -30,7 +30,7 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.fml.ModList;
+import net.neoforged.fml.ModList;
 
 import java.util.*;
 import java.util.stream.Collectors;

diff --git a/...ncedperipherals/common/addons/computercraft/peripheral/EnvironmentDetectorPeripheral.java b/...ncedperipherals/common/addons/computercraft/peripheral/EnvironmentDetectorPeripheral.java
@@ -32,10 +32,10 @@
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
 import net.minecraft.world.phys.AABB;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.SleepingTimeCheckEvent;
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.server.ServerLifecycleHooks;
+import net.neoforged.common.MinecraftForge;
+import net.neoforged.event.entity.player.SleepingTimeCheckEvent;
+import net.neoforged.eventbus.api.Event;
+import net.neoforged.server.ServerLifecycleHooks;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;

diff --git a/...endi/advancedperipherals/common/addons/computercraft/peripheral/GeoScannerPeripheral.java b/...endi/advancedperipherals/common/addons/computercraft/peripheral/GeoScannerPeripheral.java
@@ -24,8 +24,8 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraftforge.common.Tags;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.neoforged.common.Tags;
+import net.neoforged.registries.ForgeRegistries;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/...dvancedperipherals/common/addons/computercraft/peripheral/InventoryManagerPeripheral.java b/...dvancedperipherals/common/addons/computercraft/peripheral/InventoryManagerPeripheral.java
@@ -18,11 +18,11 @@
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.wrapper.PlayerArmorInvWrapper;
-import net.minecraftforge.items.wrapper.PlayerInvWrapper;
-import net.minecraftforge.items.wrapper.PlayerOffhandInvWrapper;
+import net.neoforged.common.capabilities.ForgeCapabilities;
+import net.neoforged.items.IItemHandler;
+import net.neoforged.items.wrapper.PlayerArmorInvWrapper;
+import net.neoforged.items.wrapper.PlayerInvWrapper;
+import net.neoforged.items.wrapper.PlayerOffhandInvWrapper;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/...srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java b/...srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java
@@ -26,8 +26,8 @@
 import de.srendi.advancedperipherals.common.util.inventory.InventoryUtil;
 import de.srendi.advancedperipherals.common.util.inventory.ItemFilter;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
-import net.minecraftforge.fluids.capability.IFluidHandler;
-import net.minecraftforge.items.IItemHandler;
+import net.neoforged.fluids.capability.IFluidHandler;
+import net.neoforged.items.IItemHandler;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/.../advancedperipherals/common/addons/computercraft/peripheral/PlayerDetectorPeripheral.java b/.../advancedperipherals/common/addons/computercraft/peripheral/PlayerDetectorPeripheral.java
@@ -21,7 +21,7 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.server.ServerLifecycleHooks;
+import net.neoforged.server.ServerLifecycleHooks;
 
 import java.util.*;
 

diff --git a/...srendi/advancedperipherals/common/addons/computercraft/peripheral/RsBridgePeripheral.java b/...srendi/advancedperipherals/common/addons/computercraft/peripheral/RsBridgePeripheral.java
@@ -21,9 +21,9 @@
 import de.srendi.advancedperipherals.common.util.inventory.*;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.capability.IFluidHandler;
-import net.minecraftforge.items.IItemHandler;
+import net.neoforged.fluids.FluidStack;
+import net.neoforged.fluids.capability.IFluidHandler;
+import net.neoforged.items.IItemHandler;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...cedperipherals/common/addons/computercraft/peripheral/plugins/AutomataChargingPlugin.java b/...cedperipherals/common/addons/computercraft/peripheral/plugins/AutomataChargingPlugin.java
@@ -10,7 +10,7 @@
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.lib.peripherals.AutomataCorePeripheral;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.neoforged.common.capabilities.ForgeCapabilities;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;

diff --git a/...cedperipherals/common/addons/computercraft/peripheral/plugins/AutomataItemSuckPlugin.java b/...cedperipherals/common/addons/computercraft/peripheral/plugins/AutomataItemSuckPlugin.java
@@ -14,7 +14,7 @@
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.phys.AABB;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.neoforged.registries.ForgeRegistries;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;

diff --git a/...dvancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataLookPlugin.java b/...dvancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataLookPlugin.java
@@ -10,7 +10,7 @@
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.HitResult;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.neoforged.registries.ForgeRegistries;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/create/BasinIntegration.java b/src/main/java/de/srendi/advancedperipherals/common/addons/create/BasinIntegration.java
@@ -4,11 +4,11 @@
 import dan200.computercraft.api.lua.LuaFunction;
 import de.srendi.advancedperipherals.common.util.LuaConverter;
 import de.srendi.advancedperipherals.lib.peripherals.APGenericPeripheral;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.capability.IFluidHandler;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.neoforged.common.capabilities.ForgeCapabilities;
+import net.neoforged.fluids.FluidStack;
+import net.neoforged.fluids.capability.IFluidHandler;
+import net.neoforged.items.IItemHandler;
+import net.neoforged.registries.ForgeRegistries;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/create/FluidTankIntegration.java b/src/main/java/de/srendi/advancedperipherals/common/addons/create/FluidTankIntegration.java
@@ -3,7 +3,7 @@
 import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity;
 import dan200.computercraft.api.lua.LuaFunction;
 import de.srendi.advancedperipherals.lib.peripherals.APGenericPeripheral;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.neoforged.registries.ForgeRegistries;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;

diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/minecolonies/MineColonies.java b/src/main/java/de/srendi/advancedperipherals/common/addons/minecolonies/MineColonies.java
@@ -29,10 +29,10 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
-import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.server.command.TextComponentHelper;
+import net.neoforged.common.capabilities.ForgeCapabilities;
+import net.neoforged.common.util.LazyOptional;
+import net.neoforged.items.IItemHandler;
+import net.neoforged.server.command.TextComponentHelper;
 
 import java.util.ArrayList;
 import java.util.HashMap;