Fix handling of zero emc fluids (#88)

src/main/java/cool/furry/mc/forge/projectexpansion/block/entity/BlockEntityEMCLink.java

@@ -313,6 +313,14 @@ private double getFluidCostPer() {
             }
         }
 
+        private boolean isFreeFluid() {
+            return getFluidCostPer() == 0D && Config.zeroEmcFluidsAreFree.get();
+        }
+
+        private boolean isValid() {
+            return getFluid() != null && (getFluidCostPer() != 0D || isFreeFluid());
+        }
+
         private long getFluidCost(double amount) {
             try {
                 double cost = getFluidCostPer();
@@ -330,13 +338,21 @@ public int getTanks() {
         @Nonnull
         @Override
         public FluidStack getFluidInTank(int tank) {
+            if(tank != 0) {
+                return FluidStack.EMPTY;
+            }
+
             Fluid fluid = getFluid();
-            if (fluid == null || getFluidCostPer() == 0D) return FluidStack.EMPTY;
+            if (fluid == null || !isValid()) return FluidStack.EMPTY;
             return new FluidStack(fluid, remainingFluid);
         }
 
         @Override
         public int getTankCapacity(int tank) {
+            if(tank != 0) {
+                return 0;
+            }
+
             return remainingFluid;
         }
 
@@ -354,17 +370,16 @@ public int fill(FluidStack resource, FluidAction action) {
         @Override
         public FluidStack drain(FluidStack resource, FluidAction action) {
             Fluid fluid = getFluid();
-            if (fluid != null && getFluidCostPer() != 0D && resource.getFluid().equals(fluid))
-                return drain(resource.getAmount(), action);
-            return FluidStack.EMPTY;
+            if (fluid == null || !isValid() || !resource.getFluid().equals(fluid)) return FluidStack.EMPTY;
+            return drain(resource.getAmount(), action);
         }
 
         @Nonnull
         @Override
         public FluidStack drain(int maxDrain, FluidAction action) {
             boolean isFinal = getMatter() == Matter.FINAL;
             Fluid fluid = getFluid();
-            if (fluid == null || getFluidCostPer() == 0D || Util.getPlayer(owner) == null) return FluidStack.EMPTY;
+            if (fluid == null || !isValid() || Util.getPlayer(owner) == null) return FluidStack.EMPTY;
             if (!isFinal && maxDrain > remainingFluid) maxDrain = remainingFluid;
             long cost = getFluidCost(maxDrain);
             @Nullable IKnowledgeProvider provider = Util.getKnowledgeProvider(owner);
@@ -383,8 +398,10 @@ public FluidStack drain(int maxDrain, FluidAction action) {
             if (action.execute()) {
                 if (!isFinal) remainingFluid -= maxDrain;
                 Util.markDirty(BlockEntityEMCLink.this);
-                provider.setEmc(emc.subtract(BigInteger.valueOf(cost)));
-                provider.syncEmc(Objects.requireNonNull(Util.getPlayer(owner)));
+                if(!isFreeFluid()) {
+                    provider.setEmc(emc.subtract(BigInteger.valueOf(cost)));
+                    provider.syncEmc(Objects.requireNonNull(Util.getPlayer(owner)));
+                }
             }
             return new FluidStack(fluid, maxDrain);
         }
@@ -428,8 +445,8 @@ public InteractionResult handleActivation(Player player, InteractionHand hand) {
         }
 
         Fluid fluid = fluidHandler.getFluid();
-        if(fluid != null && fluidHandler.getFluidCostPer() != 0D && inHand.getItem() instanceof BucketItem bucketItem && bucketItem.getFluid() == Fluids.EMPTY) {
-            if(Config.limitEmcLinkVendor.get() && remainingExport < 1000) {
+        if(fluid != null && fluidHandler.isValid() && inHand.getItem() instanceof BucketItem bucketItem && bucketItem.getFluid() == Fluids.EMPTY) {
+            if(Config.limitEmcLinkVendor.get() && remainingFluid < 1000) {
                 player.displayClientMessage(Lang.Blocks.EMC_LINK_NO_EXPORT_REMAINING.translateColored(ChatFormatting.RED), true);
                 return InteractionResult.CONSUME;
             }

src/main/java/cool/furry/mc/forge/projectexpansion/capability/IAlchemicalBookLocationsProvider.java

@@ -1,7 +1,6 @@
 package cool.furry.mc.forge.projectexpansion.capability;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import cool.furry.mc.forge.projectexpansion.item.ItemAlchemicalBook;
 import net.minecraft.core.GlobalPos;
 import net.minecraft.nbt.CompoundTag;
@@ -11,9 +10,6 @@
 import net.minecraftforge.common.util.INBTSerializable;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-import java.util.Map;
-
 public interface IAlchemicalBookLocationsProvider extends INBTSerializable<CompoundTag> {
     void addLocation(Player player, String name) throws CapabilityAlchemicalBookLocations.BookError.DuplicateNameError;
     void addLocation(String name, GlobalPos pos) throws CapabilityAlchemicalBookLocations.BookError.DuplicateNameError;

src/main/java/cool/furry/mc/forge/projectexpansion/commands/CommandEMC.java

@@ -1,6 +1,5 @@
 package cool.furry.mc.forge.projectexpansion.commands;
 
-import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;

src/main/java/cool/furry/mc/forge/projectexpansion/config/Config.java

@@ -30,6 +30,7 @@ public final class Config {
     public static final ForgeConfigSpec.ConfigValue<Boolean> enabledLearnedTooltip = Builder.comment("If a tooltip should be shown on items which can be learned, denoting if the item has been learned or not. Note: ProjectE's client.shiftEmcToolTips applies to this.").define("enabledLearnedTooltip", true);
     public static final ForgeConfigSpec.ConfigValue<Boolean> alchemicalCollectionSound = Builder.comment("If a sound should be played when something is collected with Alchemical Collection.").define("alchemicalCollectionSound", true);
     private static final ForgeConfigSpec.ConfigValue<String> editOthersAlchemicalBooks = Builder.comment("If players should be allowed to edit books bound to other players. A player is considered to be \"OP\" when they have an op level of 2 or greater. Allowed values: DISABLED, OP_ONLY, ENABLED").define("editOthersAlchemicalBooks", AlchemicalBookEditLevel.DISABLED.name());
+    public static final ForgeConfigSpec.ConfigValue<Boolean> zeroEmcFluidsAreFree = Builder.comment("If fluids which end their calculations at zero emc should be returned as free.").define("zeroEmcFluidsAreFree", true);
     static { Spec = Builder.build(); }
     public static AlchemicalBookEditLevel editOthersAlchemicalBooks() {
         try {

src/main/java/cool/furry/mc/forge/projectexpansion/events/PlayerEvents.java

@@ -22,9 +22,7 @@ public static void cloneEvent(PlayerEvent.Clone event) {
         original.reviveCaps();
         original.getCapability(Capabilities.ALCHEMICAL_BOOK_LOCATIONS).ifPresent(old -> {
             CompoundTag tag = old.serializeNBT();
-            event.getEntity().getCapability(Capabilities.ALCHEMICAL_BOOK_LOCATIONS).ifPresent(newCap -> {
-                newCap.deserializeNBT(tag);
-            });
+            event.getEntity().getCapability(Capabilities.ALCHEMICAL_BOOK_LOCATIONS).ifPresent(newCap -> newCap.deserializeNBT(tag));
         });
         original.invalidateCaps();
     }

src/main/java/cool/furry/mc/forge/projectexpansion/gui/GUIAlchemicalBook.java

@@ -15,7 +15,6 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.Registry;

src/main/java/cool/furry/mc/forge/projectexpansion/net/packets/to_client/PacketSyncAlchemicalBookLocations.java

@@ -34,9 +34,7 @@ public static PacketSyncAlchemicalBookLocations decode(FriendlyByteBuf buf) {
 
     public static void writeLocationsToBuffer(FriendlyByteBuf buf, List<CapabilityAlchemicalBookLocations.TeleportLocation> locations) {
         buf.writeVarInt(locations.size());
-        locations.forEach(location -> {
-            buf.writeNbt(location.serialize());
-        });
+        locations.forEach(location -> buf.writeNbt(location.serialize()));
     }
 
     public static List<CapabilityAlchemicalBookLocations.TeleportLocation> readLocationsFromBuffer(FriendlyByteBuf buf) {

src/main/java/cool/furry/mc/forge/projectexpansion/net/packets/to_server/PacketCreateTeleportDestination.java

@@ -1,30 +1,21 @@
 package cool.furry.mc.forge.projectexpansion.net.packets.to_server;
 
 
-import cool.furry.mc.forge.projectexpansion.Main;
 import cool.furry.mc.forge.projectexpansion.capability.CapabilityAlchemicalBookLocations;
 import cool.furry.mc.forge.projectexpansion.capability.IAlchemicalBookLocationsProvider;
 import cool.furry.mc.forge.projectexpansion.item.ItemAlchemicalBook;
-import cool.furry.mc.forge.projectexpansion.net.PacketHandler;
 import cool.furry.mc.forge.projectexpansion.net.packets.IPacket;
-import cool.furry.mc.forge.projectexpansion.net.packets.to_client.PacketSyncAlchemicalBookLocations;
 import cool.furry.mc.forge.projectexpansion.util.Lang;
 import cool.furry.mc.forge.projectexpansion.util.Util;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.network.NetworkEvent;
 import net.minecraftforge.server.ServerLifecycleHooks;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.jmx.Server;
 
-import javax.annotation.Nullable;
 import java.util.UUID;
 
 public class PacketCreateTeleportDestination implements IPacket {

src/main/java/cool/furry/mc/forge/projectexpansion/net/packets/to_server/PacketDeleteTeleportDestination.java

@@ -1,27 +1,21 @@
 package cool.furry.mc.forge.projectexpansion.net.packets.to_server;
 
 
-import cool.furry.mc.forge.projectexpansion.Main;
 import cool.furry.mc.forge.projectexpansion.capability.CapabilityAlchemicalBookLocations;
 import cool.furry.mc.forge.projectexpansion.capability.IAlchemicalBookLocationsProvider;
 import cool.furry.mc.forge.projectexpansion.item.ItemAlchemicalBook;
-import cool.furry.mc.forge.projectexpansion.net.PacketHandler;
 import cool.furry.mc.forge.projectexpansion.net.packets.IPacket;
-import cool.furry.mc.forge.projectexpansion.net.packets.to_client.PacketSyncAlchemicalBookLocations;
 import cool.furry.mc.forge.projectexpansion.util.Lang;
 import cool.furry.mc.forge.projectexpansion.util.Util;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.network.NetworkEvent;
 import net.minecraftforge.server.ServerLifecycleHooks;
-import org.apache.logging.log4j.LogManager;
 
-import javax.annotation.Nullable;
 import java.util.UUID;
 
 public class PacketDeleteTeleportDestination implements IPacket {

src/main/java/cool/furry/mc/forge/projectexpansion/util/Lang.java

@@ -4,7 +4,6 @@
 import moze_intel.projecte.utils.text.ILangEntry;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.resources.ResourceLocation;
 
 @SuppressWarnings("unused")
 public enum Lang implements ILangEntry {