Remove things that we deprecated for removal and rename a few methods in module helper

Author: pupnewfster

src/api/java/mekanism/api/chemical/merged/ChemicalTankWrapper.java

@@ -1,6 +1,5 @@
 package mekanism.api.chemical.merged;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.function.BooleanSupplier;
 import mekanism.api.Action;
@@ -27,11 +26,6 @@ public abstract class ChemicalTankWrapper<CHEMICAL extends Chemical<CHEMICAL>, S
     private final BooleanSupplier insertCheck;
     private final MergedChemicalTank mergedTank;
 
-    @Deprecated(forRemoval = true, since = "10.5.15")
-    protected ChemicalTankWrapper(MergedChemicalTank mergedTank, IChemicalTank<CHEMICAL, STACK> internal, BooleanSupplier insertCheck) {
-        this(mergedTank, internal, Collections.emptyList(), insertCheck);
-    }
-
     protected ChemicalTankWrapper(MergedChemicalTank mergedTank, IChemicalTank<CHEMICAL, STACK> internal, List<IChemicalTank<?, ?>> otherTanks,
           @Nullable BooleanSupplier insertCheck) {
         //TODO: Do we want to short circuit it so that if we are not empty it allows for inserting before checking the insertCheck

src/api/java/mekanism/api/chemical/merged/MergedChemicalTank.java

@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -197,16 +196,6 @@ private boolean canHandle(IChemicalTank<?, ?> tank) {
             return tankValidator.test(tank);
         }
 
-        /**
-         * It is assumed that {@link #canHandle(IChemicalTank)} is called before this method
-         *
-         * @deprecated Use {@link #createWrapper(MergedChemicalTank, IChemicalTank, List, BooleanSupplier)}
-         */
-        @Deprecated(forRemoval = true, since = "10.5.15")
-        public TANK createWrapper(MergedChemicalTank mergedTank, IChemicalTank<?, ?> tank, BooleanSupplier insertCheck) {
-            return createWrapper(mergedTank, tank, Collections.emptyList(), insertCheck);
-        }
-
         /**
          * It is assumed that {@link #canHandle(IChemicalTank)} is called before this method
          *
@@ -224,47 +213,27 @@ public String toString() {
 
     private static class GasTankWrapper extends ChemicalTankWrapper<Gas, GasStack> implements IGasTank {
 
-        @Deprecated(forRemoval = true, since = "10.5.15")
-        public GasTankWrapper(MergedChemicalTank mergedTank, IGasTank internal, BooleanSupplier insertCheck) {
-            this(mergedTank, internal, Collections.emptyList(), insertCheck);
-        }
-
         public GasTankWrapper(MergedChemicalTank mergedTank, IGasTank internal, List<IChemicalTank<?, ?>> otherTanks, @Nullable BooleanSupplier insertCheck) {
             super(mergedTank, internal, otherTanks, insertCheck);
         }
     }
 
     private static class InfusionTankWrapper extends ChemicalTankWrapper<InfuseType, InfusionStack> implements IInfusionTank {
 
-        @Deprecated(forRemoval = true, since = "10.5.15")
-        public InfusionTankWrapper(MergedChemicalTank mergedTank, IInfusionTank internal, BooleanSupplier insertCheck) {
-            this(mergedTank, internal, Collections.emptyList(), insertCheck);
-        }
-
         public InfusionTankWrapper(MergedChemicalTank mergedTank, IInfusionTank internal, List<IChemicalTank<?, ?>> otherTanks, @Nullable BooleanSupplier insertCheck) {
             super(mergedTank, internal, otherTanks, insertCheck);
         }
     }
 
     private static class PigmentTankWrapper extends ChemicalTankWrapper<Pigment, PigmentStack> implements IPigmentTank {
 
-        @Deprecated(forRemoval = true, since = "10.5.15")
-        public PigmentTankWrapper(MergedChemicalTank mergedTank, IPigmentTank internal, BooleanSupplier insertCheck) {
-            this(mergedTank, internal, Collections.emptyList(), insertCheck);
-        }
-
         public PigmentTankWrapper(MergedChemicalTank mergedTank, IPigmentTank internal, List<IChemicalTank<?, ?>> otherTanks, @Nullable BooleanSupplier insertCheck) {
             super(mergedTank, internal, otherTanks, insertCheck);
         }
     }
 
     private static class SlurryTankWrapper extends ChemicalTankWrapper<Slurry, SlurryStack> implements ISlurryTank {
 
-        @Deprecated(forRemoval = true, since = "10.5.15")
-        public SlurryTankWrapper(MergedChemicalTank mergedTank, ISlurryTank internal, BooleanSupplier insertCheck) {
-            this(mergedTank, internal, Collections.emptyList(), insertCheck);
-        }
-
         public SlurryTankWrapper(MergedChemicalTank mergedTank, ISlurryTank internal, List<IChemicalTank<?, ?>> otherTanks, @Nullable BooleanSupplier insertCheck) {
             super(mergedTank, internal, otherTanks, insertCheck);
         }

src/api/java/mekanism/api/fluid/ExtendedFluidHandlerUtils.java

@@ -5,8 +5,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
-import java.util.function.IntFunction;
-import java.util.function.IntSupplier;
 import java.util.function.ToIntFunction;
 import mekanism.api.Action;
 import mekanism.api.AutomationType;
@@ -15,25 +13,10 @@
 import mekanism.api.container.IntContainerInteraction;
 import net.minecraft.core.Direction;
 import net.neoforged.neoforge.fluids.FluidStack;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ExtendedFluidHandlerUtils {
 
-    /**
-     * Util method for a generic insert implementation for various handlers. Mainly for internal use only
-     *
-     * @deprecated Please use {@link #insert(FluidStack, Direction, Action, ToIntFunction, InContainerGetter, ContainerInteraction)} to avoid capturing lambdas.
-     */
-    @Deprecated(forRemoval = true, since = "10.5.13")
-    public static FluidStack insert(FluidStack stack, Action action, IntSupplier tankCount, IntFunction<@NotNull FluidStack> inTankGetter, InsertFluid insertFluid) {
-        if (stack.isEmpty()) {
-            //Short circuit if nothing is actually being inserted
-            return FluidStack.EMPTY;
-        }
-        return insert(stack, null, action, side -> tankCount.getAsInt(), (tank, side) -> inTankGetter.apply(tank), (tank, fluid, side, act) -> insertFluid.insert(tank, fluid, act));
-    }
-
     /**
      * Util method for a generic insert implementation for various handlers. Mainly for internal use only
      *
@@ -125,19 +108,6 @@ public static FluidStack insert(FluidStack stack, @Nullable Direction side, Func
         return toInsert;
     }
 
-    /**
-     * Util method for a generic extraction implementation for various handlers. Mainly for internal use only
-     *
-     * @deprecated Please use {@link #extract(int, Direction, Action, ToIntFunction, InContainerGetter, IntContainerInteraction)} to avoid capturing lambdas.
-     */
-    @Deprecated(forRemoval = true, since = "10.5.13")
-    public static FluidStack extract(int amount, Action action, IntSupplier tankCount, IntFunction<@NotNull FluidStack> inTankGetter, ExtractFluid extractFluid) {
-        if (amount == 0) {
-            return FluidStack.EMPTY;
-        }
-        return extract(amount, null, action, side -> tankCount.getAsInt(), (tank, side) -> inTankGetter.apply(tank), (tank, fluid, side, act) -> extractFluid.extract(tank, fluid, act));
-    }
-
     /**
      * Util method for a generic extraction implementation for various handlers. Mainly for internal use only
      *
@@ -222,19 +192,6 @@ public static FluidStack extract(int amount, @Nullable Direction side, Function<
         return extracted;
     }
 
-    /**
-     * Util method for a generic extraction implementation for various handlers. Mainly for internal use only
-     *
-     * @deprecated Please use {@link #extract(FluidStack, Direction, Action, ToIntFunction, InContainerGetter, IntContainerInteraction)} to avoid capturing lambdas.
-     */
-    @Deprecated(forRemoval = true, since = "10.5.13")
-    public static FluidStack extract(FluidStack stack, Action action, IntSupplier tankCount, IntFunction<@NotNull FluidStack> inTankGetter, ExtractFluid extractFluid) {
-        if (stack.isEmpty()) {
-            return FluidStack.EMPTY;
-        }
-        return extract(stack, null, action, side -> tankCount.getAsInt(), (tank, side) -> inTankGetter.apply(tank), (tank, fluid, side, act) -> extractFluid.extract(tank, fluid, act));
-    }
-
     /**
      * Util method for a generic extraction implementation for various handlers. Mainly for internal use only
      *
@@ -324,24 +281,4 @@ public static FluidStack extract(FluidStack stack, @Nullable Direction side, Fun
         }
         return extracted;
     }
-
-    /**
-     * @deprecated See {@link mekanism.api.container.ContainerInteraction}
-     */
-    @FunctionalInterface
-    @Deprecated(forRemoval = true, since = "10.5.13")
-    public interface InsertFluid {
-
-        FluidStack insert(int tank, FluidStack stack, Action action);
-    }
-
-    /**
-     * @deprecated See {@link mekanism.api.container.IntContainerInteraction}
-     */
-    @FunctionalInterface
-    @Deprecated(forRemoval = true, since = "10.5.13")
-    public interface ExtractFluid {
-
-        FluidStack extract(int tank, int amount, Action action);
-    }
 }

src/api/java/mekanism/api/gear/IModuleHelper.java

@@ -4,7 +4,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -101,7 +100,7 @@ public interface IModuleHelper {
      * @return {@code true} if the item has the module installed and enabled.
      */
     default boolean isEnabled(ItemStack stack, IModuleDataProvider<?> typeProvider) {
-        IModuleContainer container = getModuleContainerNullable(stack);
+        IModuleContainer container = getModuleContainer(stack);
         return container != null && container.hasEnabled(typeProvider);
     }
 
@@ -114,9 +113,8 @@ default boolean isEnabled(ItemStack stack, IModuleDataProvider<?> typeProvider)
      * @return Module, or {@code null} if no module of the given type is installed.
      */
     @Nullable
-    default <MODULE extends ICustomModule<MODULE>> IModule<MODULE> load(ItemStack stack, IModuleDataProvider<MODULE> typeProvider) {
-        //TODO - 1.20.5: Rename to getModule or get, and also re-evaluate other names in this class
-        IModuleContainer container = getModuleContainerNullable(stack);
+    default <MODULE extends ICustomModule<MODULE>> IModule<MODULE> getModule(ItemStack stack, IModuleDataProvider<MODULE> typeProvider) {
+        IModuleContainer container = getModuleContainer(stack);
         return container == null ? null : container.get(typeProvider);
     }
 
@@ -130,7 +128,7 @@ default <MODULE extends ICustomModule<MODULE>> IModule<MODULE> load(ItemStack st
      */
     @Nullable
     default <MODULE extends ICustomModule<MODULE>> IModule<MODULE> getIfEnabled(ItemStack stack, IModuleDataProvider<MODULE> typeProvider) {
-        IModuleContainer container = getModuleContainerNullable(stack);
+        IModuleContainer container = getModuleContainer(stack);
         return container == null ? null : container.getIfEnabled(typeProvider);
     }
 
@@ -146,46 +144,19 @@ default <MODULE extends ICustomModule<MODULE>> IModule<MODULE> getIfEnabled(Item
     @Nullable
     default <MODULE extends ICustomModule<MODULE>> IModule<MODULE> getIfEnabled(@Nullable LivingEntity entity, @Nullable EquipmentSlot slot,
           IModuleDataProvider<MODULE> typeProvider) {
-        IModuleContainer container = getModuleContainerNullable(entity, slot);
+        IModuleContainer container = getModuleContainer(entity, slot);
         return container == null ? null : container.getIfEnabled(typeProvider);
     }
 
-    /**
-     * {@return module container for the stack, or empty if it is empty or not a module container}
-     *
-     * @param stack Stack to check for being a module container and then to retrieve the container of.
-     *
-     * @since 10.5.0
-     * @deprecated Prefer using {@link #getModuleContainerNullable(ItemStack)}
-     */
-    @Deprecated(forRemoval = true, since = "10.5.15")
-    default Optional<? extends IModuleContainer> getModuleContainer(ItemStack stack) {
-        return Optional.ofNullable(getModuleContainerNullable(stack));
-    }
-
     /**
      * {@return module container for the stack, or null if the stack is empty or not a module container}
      *
      * @param stack Stack to check for being a module container and then to retrieve the container of.
      *
      * @since 10.5.15
      */
-    @Nullable//TODO - 1.20.5: Rename to getModuleContainer
-    IModuleContainer getModuleContainerNullable(ItemStack stack);
-
-    /**
-     * {@return module container for the item in entity's equipment slot, or empty if it is empty or not a module container}
-     *
-     * @param entity Entity that has the stack.
-     * @param slot   Slot the stack is in.
-     *
-     * @since 10.5.0
-     * @deprecated Prefer using {@link #getModuleContainerNullable(LivingEntity, EquipmentSlot)}
-     */
-    @Deprecated(forRemoval = true, since = "10.5.15")
-    default Optional<? extends IModuleContainer> getModuleContainer(@Nullable LivingEntity entity, @Nullable EquipmentSlot slot) {
-        return Optional.ofNullable(getModuleContainerNullable(entity, slot));
-    }
+    @Nullable
+    IModuleContainer getModuleContainer(ItemStack stack);
 
     /**
      * {@return module container for the item in entity's equipment slot, or null if the entity is null, or the stack is empty or not a module container}
@@ -195,12 +166,12 @@ default Optional<? extends IModuleContainer> getModuleContainer(@Nullable Living
      *
      * @since 10.5.15
      */
-    @Nullable//TODO - 1.20.5: Rename to getModuleContainer
-    default IModuleContainer getModuleContainerNullable(@Nullable LivingEntity entity, @Nullable EquipmentSlot slot) {
+    @Nullable
+    default IModuleContainer getModuleContainer(@Nullable LivingEntity entity, @Nullable EquipmentSlot slot) {
         if (entity == null || slot == null) {
             return null;
         }
-        return getModuleContainerNullable(entity.getItemBySlot(slot));
+        return getModuleContainer(entity.getItemBySlot(slot));
     }
 
     /**
@@ -232,8 +203,8 @@ default boolean isModuleContainer(ItemStack stack) {
      *
      * @param stack Module container, for example a Meka-Tool or MekaSuit piece.
      */
-    default Collection<? extends IModule<?>> loadAll(ItemStack stack) {
-        IModuleContainer container = getModuleContainerNullable(stack);
+    default Collection<? extends IModule<?>> getAllModules(ItemStack stack) {
+        IModuleContainer container = getModuleContainer(stack);
         return container != null ? container.modules() : Collections.emptyList();
     }
 
@@ -246,9 +217,9 @@ default Collection<? extends IModule<?>> loadAll(ItemStack stack) {
      * @return List of modules on an item of the given class, or an empty list if the item doesn't support modules or has no modules of that type.
      */
     @SuppressWarnings("unchecked")
-    default <MODULE extends ICustomModule<?>> List<? extends IModule<? extends MODULE>> loadAll(ItemStack stack, Class<MODULE> moduleClass) {
+    default <MODULE extends ICustomModule<?>> List<? extends IModule<? extends MODULE>> getAllModules(ItemStack stack, Class<MODULE> moduleClass) {
         List<IModule<? extends MODULE>> list = new ArrayList<>();
-        for (IModule<?> module : loadAll(stack)) {
+        for (IModule<?> module : getAllModules(stack)) {
             if (moduleClass.isInstance(module.getCustomInstance())) {
                 list.add((IModule<? extends MODULE>) module);
             }
@@ -263,8 +234,8 @@ default <MODULE extends ICustomModule<?>> List<? extends IModule<? extends MODUL
      *
      * @return Module types on an item.
      */
-    default Set<ModuleData<?>> loadAllTypes(ItemStack stack) {
-        IModuleContainer container = getModuleContainerNullable(stack);
+    default Set<ModuleData<?>> getAllTypes(ItemStack stack) {
+        IModuleContainer container = getModuleContainer(stack);
         return container != null ? container.moduleTypes() : Collections.emptySet();
     }
 

src/api/java/mekanism/api/gear/config/ModuleEnumData.java

@@ -58,35 +58,6 @@ public ModuleEnumData(TYPE def, int selectableCount) {
         }
     }
 
-    /**
-     * Creates a new {@link ModuleEnumData} out of a given enum type and initializes it to the given default value.
-     *
-     * @param enumClass Class of the Enum this {@link ModuleEnumData} corresponds to.
-     * @param def       Default value.
-     *
-     * @deprecated since 10.3.2, use the version ({@link #ModuleEnumData(Enum)}) that figures out the class automatically.
-     */
-    @Deprecated(forRemoval = true, since = "10.3.2")
-    public ModuleEnumData(Class<TYPE> enumClass, TYPE def) {
-        this(def);
-        Objects.requireNonNull(enumClass, "Enum Class cannot be null.");
-    }
-
-    /**
-     * Creates a new {@link ModuleEnumData} out of the first selectableCount elements in the given enum type and initializes it to the given default value.
-     *
-     * @param enumClass       Class of the Enum this {@link ModuleEnumData} corresponds to.
-     * @param selectableCount The number of selectable elements.
-     * @param def             Default value.
-     *
-     * @deprecated since 10.3.2, use the version ({@link #ModuleEnumData(Enum, int)}) that figures out the class automatically.
-     */
-    @Deprecated(forRemoval = true, since = "10.3.2")
-    public ModuleEnumData(Class<TYPE> enumClass, int selectableCount, TYPE def) {
-        this(def, selectableCount);
-        Objects.requireNonNull(enumClass, "Enum Class cannot be null.");
-    }
-
     /**
      * Gets all the valid values of this {@link ModuleEnumData}.
      *