work on 1.21 port

build.gradle

@@ -81,9 +81,9 @@ configurations {
 
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
-    compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
-    compileOnly "mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}"
-    localRuntime "mezz.jei:jei-${mc_version}-neoforge:${jei_version}"
+    compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
+    compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
+    localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
 
 }
 
@@ -130,4 +130,17 @@ idea {
         downloadSources = true
         downloadJavadoc = true
     }
+}
+
+repositories {
+    maven {
+        // location of the maven that hosts JEI files since January 2023
+        name = "Jared's maven"
+        url = "https://maven.blamejared.com/"
+    }
+    maven {
+        // location of a maven mirror for JEI files, as a fallback
+        name = "ModMaven"
+        url = "https://modmaven.dev"
+    }
 }

gen_run_files.bat

@@ -1 +1 @@
-gradlew genEclipse
+gradlew genIntellijRuns

gradle.properties

@@ -13,17 +13,17 @@ mod_name=Electrodynamics
 mod_license=All Rights Reserved
 mod_authors=aurilisdev, skip999
 mod_credits=Thanks to all contributors. French translation by Roi Pasteque.
-mod_description='A mod based around realistic electricity.'
+mod_description=A mod based around realistic electricity.
 
 # Version parameters
 minecraft_version=1.21
 minecraft_version_range=[1.21,1.21.1)
-neo_version=21.0.0-beta
+neo_version=21.0.95-beta
 neo_version_range=[21.0.0-beta,)
 loader_version_range=[4,)
 
 # Dependency parameters 
-jei_version=17.0.0.30
+jei_version=19.1.1.19
 
 # Parchment parameters
 neogradle.subsystems.parchment.minecraftVersion=1.20.6

output.txt

@@ -1,3 +1,6 @@
+java version "17.0.1" 2021-10-19 LTS
+Java(TM) SE Runtime Environment (build 17.0.1+12-LTS-39)
+Java HotSpot(TM) 64-Bit Server VM (build 17.0.1+12-LTS-39, mixed mode, sharing)
 
 FAILURE: Build failed with an exception.
 

refresh dependencies.bat

@@ -1,5 +1,6 @@
-set JAVA_PATH=C:\Program Files\Java\jdk-17.0.1
-set Path=%JAVA_HOME%\bin;%Path%
+set JAVA_PATH=C:\Program Files\Java\jdk-17.0.1\bin
+set Path=C:\Program Files\Java\jdk-17.0.1\bin;%Path%
+java -version
 2>output.txt (call refresh_cmds.bat)
 pause
 

refresh_cmds.bat

@@ -1 +1,4 @@
+set JAVA_PATH=C:\Program Files\Java\jdk-17.0.1\bin
+set Path=C:\Program Files\Java\jdk-17.0.1\bin;%Path%
+java -version
 gradlew --refresh-dependencies --info --stacktrace

src/main/java/electrodynamics/Electrodynamics.java

@@ -3,6 +3,8 @@
 import java.util.Random;
 import java.util.function.Consumer;
 
+import electrodynamics.prefab.properties.PropertyTypes;
+import net.neoforged.fml.common.EventBusSubscriber;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -13,7 +15,6 @@
 import electrodynamics.common.entity.ElectrodynamicsAttributeModifiers;
 import electrodynamics.common.event.ServerEventHandler;
 import electrodynamics.common.eventbus.RegisterPropertiesEvent;
-import electrodynamics.common.packet.NetworkHandler;
 import electrodynamics.common.packet.types.client.PacketResetGuidebookPages;
 import electrodynamics.common.reloadlistener.CoalGeneratorFuelRegister;
 import electrodynamics.common.reloadlistener.CombustionFuelRegister;
@@ -23,7 +24,6 @@
 import electrodynamics.common.tags.ElectrodynamicsTags;
 import electrodynamics.prefab.configuration.ConfigurationHandler;
 import electrodynamics.prefab.properties.PropertyManager;
-import electrodynamics.prefab.properties.PropertyType;
 import electrodynamics.registers.ElectrodynamicsCapabilities;
 import electrodynamics.registers.UnifiedElectrodynamicsRegister;
 import net.minecraft.server.level.ServerPlayer;
@@ -33,18 +33,15 @@
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModLoader;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.common.Mod.EventBusSubscriber;
-import net.neoforged.fml.common.Mod.EventBusSubscriber.Bus;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.OnDatapackSyncEvent;
 import net.neoforged.neoforge.network.PacketDistributor;
-import net.neoforged.neoforge.network.PacketDistributor.PacketTarget;
 
 @Mod(References.ID)
-@EventBusSubscriber(modid = References.ID, bus = Bus.MOD)
+@EventBusSubscriber(modid = References.ID, bus = EventBusSubscriber.Bus.MOD)
 public class Electrodynamics {
 
     public static Logger LOGGER = LogManager.getLogger(electrodynamics.api.References.ID);
@@ -65,7 +62,6 @@ public Electrodynamics(IEventBus bus) {
     @SubscribeEvent
     public static void onCommonSetup(FMLCommonSetupEvent event) {
         ServerEventHandler.init();
-        NetworkHandler.init();
         CombustionFuelRegister.INSTANCE = new CombustionFuelRegister().subscribeAsSyncable();
         CoalGeneratorFuelRegister.INSTANCE = new CoalGeneratorFuelRegister().subscribeAsSyncable();
         ThermoelectricGeneratorHeatRegister.INSTANCE = new ThermoelectricGeneratorHeatRegister().subscribeAsSyncable();
@@ -81,7 +77,7 @@ public static void onCommonSetup(FMLCommonSetupEvent event) {
         event.enqueueWork(() -> {
             RegisterPropertiesEvent properties = new RegisterPropertiesEvent();
 
-            ModLoader.get().postEvent(properties);
+            ModLoader.postEvent(properties);
 
             PropertyManager.registerProperties(properties.getRegisteredProperties());
         });
@@ -97,9 +93,23 @@ public static void registerCapabilities(RegisterCapabilitiesEvent event) {
 
     @SubscribeEvent
     public static void registerProperties(RegisterPropertiesEvent event) {
-        for (PropertyType type : PropertyType.values()) {
-            event.registerProperty(type);
-        }
+        event.registerProperty(PropertyTypes.BYTE);
+        event.registerProperty(PropertyTypes.BOOLEAN);
+        event.registerProperty(PropertyTypes.INTEGER);
+        event.registerProperty(PropertyTypes.LONG);
+        event.registerProperty(PropertyTypes.FLOAT);
+        event.registerProperty(PropertyTypes.DOUBLE);
+        event.registerProperty(PropertyTypes.UUID);
+        event.registerProperty(PropertyTypes.COMPOUND_TAG);
+        event.registerProperty(PropertyTypes.BLOCK_POS);
+        event.registerProperty(PropertyTypes.INVENTORY_ITEMS);
+        event.registerProperty(PropertyTypes.FLUID_STACK);
+        event.registerProperty(PropertyTypes.BLOCK_POS_LIST);
+        event.registerProperty(PropertyTypes.LOCATION);
+        event.registerProperty(PropertyTypes.GAS_STACK);
+        event.registerProperty(PropertyTypes.ITEM_STACK);
+        event.registerProperty(PropertyTypes.BLOCK_STATE);
+        event.registerProperty(PropertyTypes.TRANSFER_PACK);
     }
 
     // I wonder how long this bug has been there
@@ -116,8 +126,11 @@ private static Consumer<OnDatapackSyncEvent> getGuidebookListener() {
 
         return event -> {
             ServerPlayer player = event.getPlayer();
-            PacketTarget target = player == null ? PacketDistributor.ALL.noArg() : PacketDistributor.PLAYER.with(player);
-            target.send(new PacketResetGuidebookPages());
+            if(player == null){
+                PacketDistributor.sendToAllPlayers(new PacketResetGuidebookPages());
+            } else {
+                PacketDistributor.sendToPlayer(player, new PacketResetGuidebookPages());
+            }
         };
 
     }

src/main/java/electrodynamics/api/capability/types/fluid/RestrictedFluidHandlerItemStack.java

@@ -2,9 +2,9 @@
 
 import java.util.function.Predicate;
 
+import electrodynamics.registers.ElectrodynamicsDataComponentTypes;
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem;
@@ -73,7 +73,7 @@ public int fill(FluidStack resource, FluidAction action) {
 
             return fillAmount;
         }
-        if (contained.isFluidEqual(resource)) {
+        if (FluidStack.isSameFluidSameComponents(resource, contained)) {
             int fillAmount = Math.min(capacity - contained.getAmount(), resource.getAmount());
 
             if (action.execute() && fillAmount > 0) {
@@ -89,7 +89,7 @@ public int fill(FluidStack resource, FluidAction action) {
 
     @Override
     public @NotNull FluidStack drain(FluidStack resource, FluidAction action) {
-        if (container.getCount() != 1 || resource.isEmpty() || !resource.isFluidEqual(getFluid())) {
+        if (container.getCount() != 1 || resource.isEmpty() || !FluidStack.isSameFluidSameComponents(getFluid(), resource)) {
             return FluidStack.EMPTY;
         }
         return drain(resource.getAmount(), action);
@@ -130,25 +130,15 @@ public int fill(FluidStack resource, FluidAction action) {
 
     @NotNull
     public FluidStack getFluid() {
-        CompoundTag tagCompound = container.getTag();
-        if (tagCompound == null || !tagCompound.contains(FLUID_NBT_KEY)) {
-            return FluidStack.EMPTY;
-        }
-        return FluidStack.loadFluidStackFromNBT(tagCompound.getCompound(FLUID_NBT_KEY));
+        return container.getOrDefault(ElectrodynamicsDataComponentTypes.FLUID_STACK, FluidStack.EMPTY);
     }
 
     public void setFluid(FluidStack fluid) {
-        if (!container.hasTag()) {
-            container.setTag(new CompoundTag());
-        }
-
-        CompoundTag fluidTag = new CompoundTag();
-        fluid.writeToNBT(fluidTag);
-        container.getTag().put(FLUID_NBT_KEY, fluidTag);
+        container.set(ElectrodynamicsDataComponentTypes.FLUID_STACK, fluid);
     }
 
     public void setContainerToEmpty() {
-        container.removeTagKey(FLUID_NBT_KEY);
+        container.remove(ElectrodynamicsDataComponentTypes.FLUID_STACK);
     }
 
     public static class Consumable extends RestrictedFluidHandlerItemStack {

src/main/java/electrodynamics/api/capability/types/itemhandler/CapabilityItemStackHandler.java

@@ -1,8 +1,11 @@
 package electrodynamics.api.capability.types.itemhandler;
 
 import java.util.List;
+import java.util.function.Consumer;
 
-import org.apache.logging.log4j.util.TriConsumer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.level.Level;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
@@ -11,28 +14,38 @@
 
 public class CapabilityItemStackHandler extends ItemStackHandler implements INBTSerializable<CompoundTag> {
 
-	private final ItemStack owner;
+    private final ItemStack owner;
 
-	private TriConsumer<ItemStack, CapabilityItemStackHandler, Integer> onChange = (stack, handler, slot) -> {
-	};
+    private ContainerLevelAccess access = ContainerLevelAccess.NULL;
 
-	public CapabilityItemStackHandler(int size, ItemStack owner) {
-		super(size);
-		this.owner = owner;
-	}
+    private Consumer<OnChangeWrapper> onChange = (onChange) -> {
+    };
 
-	public CapabilityItemStackHandler setOnChange(TriConsumer<ItemStack, CapabilityItemStackHandler, Integer> onChange) {
-		this.onChange = onChange;
-		return this;
-	}
+    public CapabilityItemStackHandler(int size, ItemStack owner) {
+        super(size);
+        this.owner = owner;
+    }
 
-	@Override
-	protected void onContentsChanged(int slot) {
-		onChange.accept(owner, this, slot);
-	}
+    public CapabilityItemStackHandler setOnChange(Consumer<OnChangeWrapper> onChange) {
+        this.onChange = onChange;
+        return this;
+    }
 
-	public List<ItemStack> getItems() {
-		return stacks;
-	}
+    @Override
+    protected void onContentsChanged(int slot) {
+        onChange.accept(new OnChangeWrapper(owner, this, slot, access));
+    }
+
+    public List<ItemStack> getItems() {
+        return stacks;
+    }
+
+    public void setLevelAccess(Level level, BlockPos pos) {
+        access = ContainerLevelAccess.create(level, pos);
+    }
+
+    public static record OnChangeWrapper(ItemStack owner, CapabilityItemStackHandler capability, int slot, ContainerLevelAccess levelAccess) {
+
+    }
 
 }