Rename chemical IngredientCreatorAccess methods to explicitly specify stack so that the basic version can have just the chemical name

Author: pupnewfster

src/api/java/mekanism/api/IMekanismAccess.java

@@ -68,59 +68,59 @@ public interface IMekanismAccess {
     /**
      * Gets the gas stack ingredient creator.
      *
-     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#gas()} instead.
+     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#gasStack()} instead.
      */
     IChemicalStackIngredientCreator<Gas, GasStack, IGasIngredient, GasStackIngredient> gasStackIngredientCreator();
 
     /**
      * Gets the gas ingredient creator.
      *
-     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#basicGas()} instead.
+     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#gas()} instead.
      * @since 10.6.0
      */
     IChemicalIngredientCreator<Gas, IGasIngredient> gasIngredientCreator();
 
     /**
      * Gets the infusion stack ingredient creator.
      *
-     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#infusion()} instead.
+     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#infusionStack()} instead.
      */
     IChemicalStackIngredientCreator<InfuseType, InfusionStack, IInfusionIngredient, InfusionStackIngredient> infusionStackIngredientCreator();
 
     /**
      * Gets the infusion ingredient creator.
      *
-     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#basicInfusion()} instead.
+     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#infusion()} instead.
      * @since 10.6.0
      */
     IChemicalIngredientCreator<InfuseType, IInfusionIngredient> infusionIngredientCreator();
 
     /**
      * Gets the pigment stack ingredient creator.
      *
-     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#pigment()} instead.
+     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#pigmentStack()} instead.
      */
     IChemicalStackIngredientCreator<Pigment, PigmentStack, IPigmentIngredient, PigmentStackIngredient> pigmentStackIngredientCreator();
 
     /**
      * Gets the pigment ingredient creator.
      *
-     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#basicPigment()} instead.
+     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#pigment()} instead.
      * @since 10.6.0
      */
     IChemicalIngredientCreator<Pigment, IPigmentIngredient> pigmentIngredientCreator();
 
     /**
      * Gets the slurry stack ingredient creator.
      *
-     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#slurry()} instead.
+     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#slurryStack()} instead.
      */
     IChemicalStackIngredientCreator<Slurry, SlurryStack, ISlurryIngredient, SlurryStackIngredient> slurryStackIngredientCreator();
 
     /**
      * Gets the slurry ingredient creator.
      *
-     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#basicSlurry()} instead.
+     * @apiNote Use {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#slurry()} instead.
      * @since 10.6.0
      */
     IChemicalIngredientCreator<Slurry, ISlurryIngredient> slurryIngredientCreator();

src/api/java/mekanism/api/recipes/ingredients/GasStackIngredient.java

@@ -21,7 +21,7 @@
  * <p>{@link IGasIngredient}, like its item counterpart, explicitly does not perform count checks,
  * so this class is used to (a) wrap a standard GasIngredient with an amount and (b) provide a standard serialization format for mods to use.
  * <p>
- * * Create instances of this using {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#gas()}.
+ * * Create instances of this using {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#gasStack()}.
  *
  * @see net.neoforged.neoforge.common.crafting.SizedIngredient
  */
@@ -57,7 +57,7 @@ public final class GasStackIngredient extends ChemicalStackIngredient<Gas, GasSt
      * @since 10.6.0
      */
     public static final Codec<GasStackIngredient> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-          IngredientCreatorAccess.basicGas().mapCodecNonEmpty().forGetter(GasStackIngredient::ingredient),
+          IngredientCreatorAccess.gas().mapCodecNonEmpty().forGetter(GasStackIngredient::ingredient),
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(NBTConstants.AMOUNT).forGetter(GasStackIngredient::amount)
     ).apply(instance, GasStackIngredient::new));//TODO - 1.20.5: Re-evaluate how compound ingredients get serialized?? can we just make it a list
 
@@ -78,7 +78,7 @@ public final class GasStackIngredient extends ChemicalStackIngredient<Gas, GasSt
      * @since 10.6.0
      */
     public static final Codec<GasStackIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
-          IngredientCreatorAccess.basicGas().codecNonEmpty().fieldOf("ingredient").forGetter(GasStackIngredient::ingredient),
+          IngredientCreatorAccess.gas().codecNonEmpty().fieldOf("ingredient").forGetter(GasStackIngredient::ingredient),
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(NBTConstants.AMOUNT).forGetter(GasStackIngredient::amount)
     ).apply(instance, GasStackIngredient::new));
 
@@ -88,14 +88,14 @@ public final class GasStackIngredient extends ChemicalStackIngredient<Gas, GasSt
      * @since 10.6.0
      */
     public static final StreamCodec<RegistryFriendlyByteBuf, GasStackIngredient> STREAM_CODEC = StreamCodec.composite(
-          IngredientCreatorAccess.basicGas().streamCodec(), GasStackIngredient::ingredient,
+          IngredientCreatorAccess.gas().streamCodec(), GasStackIngredient::ingredient,
           ByteBufCodecs.VAR_LONG, GasStackIngredient::amount,
           GasStackIngredient::new
     );
 
     /**
      * Creates a Gas Stack Ingredient that matches a given ingredient and amount. Prefer calling via
-     * {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#gas()} and
+     * {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#gasStack()} and
      * {@link mekanism.api.recipes.ingredients.creator.IChemicalStackIngredientCreator#from(IChemicalIngredient, long)}.
      *
      * @param ingredient Ingredient to match.

src/api/java/mekanism/api/recipes/ingredients/InfusionStackIngredient.java

@@ -21,7 +21,7 @@
  * <p>{@link IInfusionIngredient}, like its item counterpart, explicitly does not perform count checks,
  * so this class is used to (a) wrap a standard InfusionIngredient with an amount and (b) provide a standard serialization format for mods to use.
  * <p>
- * * Create instances of this using {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#infusion()}.
+ * * Create instances of this using {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#infusionStack()}.
  *
  * @see net.neoforged.neoforge.common.crafting.SizedIngredient
  */
@@ -57,7 +57,7 @@ public final class InfusionStackIngredient extends ChemicalStackIngredient<Infus
      * @since 10.6.0
      */
     public static final Codec<InfusionStackIngredient> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-          IngredientCreatorAccess.basicInfusion().mapCodecNonEmpty().forGetter(InfusionStackIngredient::ingredient),
+          IngredientCreatorAccess.infusion().mapCodecNonEmpty().forGetter(InfusionStackIngredient::ingredient),
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(NBTConstants.AMOUNT).forGetter(InfusionStackIngredient::amount)
     ).apply(instance, InfusionStackIngredient::new));
 
@@ -78,7 +78,7 @@ public final class InfusionStackIngredient extends ChemicalStackIngredient<Infus
      * @since 10.6.0
      */
     public static final Codec<InfusionStackIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
-          IngredientCreatorAccess.basicInfusion().codecNonEmpty().fieldOf("ingredient").forGetter(InfusionStackIngredient::ingredient),
+          IngredientCreatorAccess.infusion().codecNonEmpty().fieldOf("ingredient").forGetter(InfusionStackIngredient::ingredient),
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(NBTConstants.AMOUNT).forGetter(InfusionStackIngredient::amount)
     ).apply(instance, InfusionStackIngredient::new));
 
@@ -88,14 +88,14 @@ public final class InfusionStackIngredient extends ChemicalStackIngredient<Infus
      * @since 10.6.0
      */
     public static final StreamCodec<RegistryFriendlyByteBuf, InfusionStackIngredient> STREAM_CODEC = StreamCodec.composite(
-          IngredientCreatorAccess.basicInfusion().streamCodec(), InfusionStackIngredient::ingredient,
+          IngredientCreatorAccess.infusion().streamCodec(), InfusionStackIngredient::ingredient,
           ByteBufCodecs.VAR_LONG, InfusionStackIngredient::amount,
           InfusionStackIngredient::new
     );
 
     /**
      * Creates an Infusion Stack Ingredient that matches a given ingredient and amount. Prefer calling via
-     * {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#infusion()} and
+     * {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#infusionStack()} and
      * {@link mekanism.api.recipes.ingredients.creator.IChemicalStackIngredientCreator#from(IChemicalIngredient, long)}.
      *
      * @param ingredient Ingredient to match.

src/api/java/mekanism/api/recipes/ingredients/PigmentStackIngredient.java

@@ -21,7 +21,7 @@
  * <p>{@link IPigmentIngredient}, like its item counterpart, explicitly does not perform count checks,
  * so this class is used to (a) wrap a standard PigmentIngredient with an amount and (b) provide a standard serialization format for mods to use.
  * <p>
- * * Create instances of this using {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#pigment()}.
+ * * Create instances of this using {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#pigmentStack()}.
  *
  * @see net.neoforged.neoforge.common.crafting.SizedIngredient
  */
@@ -57,7 +57,7 @@ public final class PigmentStackIngredient extends ChemicalStackIngredient<Pigmen
      * @since 10.6.0
      */
     public static final Codec<PigmentStackIngredient> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-          IngredientCreatorAccess.basicPigment().mapCodecNonEmpty().forGetter(PigmentStackIngredient::ingredient),
+          IngredientCreatorAccess.pigment().mapCodecNonEmpty().forGetter(PigmentStackIngredient::ingredient),
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(NBTConstants.AMOUNT).forGetter(PigmentStackIngredient::amount)
     ).apply(instance, PigmentStackIngredient::new));
 
@@ -78,7 +78,7 @@ public final class PigmentStackIngredient extends ChemicalStackIngredient<Pigmen
      * @since 10.6.0
      */
     public static final Codec<PigmentStackIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
-          IngredientCreatorAccess.basicPigment().codecNonEmpty().fieldOf("ingredient").forGetter(PigmentStackIngredient::ingredient),
+          IngredientCreatorAccess.pigment().codecNonEmpty().fieldOf("ingredient").forGetter(PigmentStackIngredient::ingredient),
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(NBTConstants.AMOUNT).forGetter(PigmentStackIngredient::amount)
     ).apply(instance, PigmentStackIngredient::new));
 
@@ -88,14 +88,14 @@ public final class PigmentStackIngredient extends ChemicalStackIngredient<Pigmen
      * @since 10.6.0
      */
     public static final StreamCodec<RegistryFriendlyByteBuf, PigmentStackIngredient> STREAM_CODEC = StreamCodec.composite(
-          IngredientCreatorAccess.basicPigment().streamCodec(), PigmentStackIngredient::ingredient,
+          IngredientCreatorAccess.pigment().streamCodec(), PigmentStackIngredient::ingredient,
           ByteBufCodecs.VAR_LONG, PigmentStackIngredient::amount,
           PigmentStackIngredient::new
     );
 
     /**
      * Creates a Pigment Stack Ingredient that matches a given ingredient and amount. Prefer calling via
-     * {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#pigment()} and
+     * {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#pigmentStack()} and
      * {@link mekanism.api.recipes.ingredients.creator.IChemicalStackIngredientCreator#from(IChemicalIngredient, long)}.
      *
      * @param ingredient Ingredient to match.

src/api/java/mekanism/api/recipes/ingredients/SlurryStackIngredient.java

@@ -21,7 +21,7 @@
  * <p>{@link ISlurryIngredient}, like its item counterpart, explicitly does not perform count checks,
  * so this class is used to (a) wrap a standard SlurryIngredient with an amount and (b) provide a standard serialization format for mods to use.
  * <p>
- * * Create instances of this using {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#slurry()}.
+ * * Create instances of this using {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#slurryStack()}.
  *
  * @see net.neoforged.neoforge.common.crafting.SizedIngredient
  */
@@ -57,7 +57,7 @@ public final class SlurryStackIngredient extends ChemicalStackIngredient<Slurry,
      * @since 10.6.0
      */
     public static final Codec<SlurryStackIngredient> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-          IngredientCreatorAccess.basicSlurry().mapCodecNonEmpty().forGetter(SlurryStackIngredient::ingredient),
+          IngredientCreatorAccess.slurry().mapCodecNonEmpty().forGetter(SlurryStackIngredient::ingredient),
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(NBTConstants.AMOUNT).forGetter(SlurryStackIngredient::amount)
     ).apply(instance, SlurryStackIngredient::new));
 
@@ -78,7 +78,7 @@ public final class SlurryStackIngredient extends ChemicalStackIngredient<Slurry,
      * @since 10.6.0
      */
     public static final Codec<SlurryStackIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
-          IngredientCreatorAccess.basicSlurry().codecNonEmpty().fieldOf("ingredient").forGetter(SlurryStackIngredient::ingredient),
+          IngredientCreatorAccess.slurry().codecNonEmpty().fieldOf("ingredient").forGetter(SlurryStackIngredient::ingredient),
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(NBTConstants.AMOUNT).forGetter(SlurryStackIngredient::amount)
     ).apply(instance, SlurryStackIngredient::new));
 
@@ -88,14 +88,14 @@ public final class SlurryStackIngredient extends ChemicalStackIngredient<Slurry,
      * @since 10.6.0
      */
     public static final StreamCodec<RegistryFriendlyByteBuf, SlurryStackIngredient> STREAM_CODEC = StreamCodec.composite(
-          IngredientCreatorAccess.basicSlurry().streamCodec(), SlurryStackIngredient::ingredient,
+          IngredientCreatorAccess.slurry().streamCodec(), SlurryStackIngredient::ingredient,
           ByteBufCodecs.VAR_LONG, SlurryStackIngredient::amount,
           SlurryStackIngredient::new
     );
 
     /**
      * Creates a Slurry Stack Ingredient that matches a given ingredient and amount. Prefer calling via
-     * {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#slurry()} and
+     * {@link mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess#slurryStack()} and
      * {@link mekanism.api.recipes.ingredients.creator.IChemicalStackIngredientCreator#from(IChemicalIngredient, long)}.
      *
      * @param ingredient Ingredient to match.

src/api/java/mekanism/api/recipes/ingredients/chemical/IGasIngredient.java

@@ -16,6 +16,6 @@ public non-sealed interface IGasIngredient extends IChemicalIngredient<Gas, IGas
     @NotNull
     @Override
     default IChemicalIngredientCreator<Gas, IGasIngredient> ingredientCreator() {
-        return IngredientCreatorAccess.basicGas();
+        return IngredientCreatorAccess.gas();
     }
 }

src/api/java/mekanism/api/recipes/ingredients/chemical/IInfusionIngredient.java

@@ -16,6 +16,6 @@ public non-sealed interface IInfusionIngredient extends IChemicalIngredient<Infu
     @NotNull
     @Override
     default IChemicalIngredientCreator<InfuseType, IInfusionIngredient> ingredientCreator() {
-        return IngredientCreatorAccess.basicInfusion();
+        return IngredientCreatorAccess.infusion();
     }
 }

src/api/java/mekanism/api/recipes/ingredients/chemical/IPigmentIngredient.java

@@ -16,6 +16,6 @@ public non-sealed interface IPigmentIngredient extends IChemicalIngredient<Pigme
     @NotNull
     @Override
     default IChemicalIngredientCreator<Pigment, IPigmentIngredient> ingredientCreator() {
-        return IngredientCreatorAccess.basicPigment();
+        return IngredientCreatorAccess.pigment();
     }
 }

src/api/java/mekanism/api/recipes/ingredients/chemical/ISlurryIngredient.java

@@ -17,6 +17,6 @@ public non-sealed interface ISlurryIngredient extends IChemicalIngredient<Slurry
     @NotNull
     @Override
     default IChemicalIngredientCreator<Slurry, ISlurryIngredient> ingredientCreator() {
-        return IngredientCreatorAccess.basicSlurry();
+        return IngredientCreatorAccess.slurry();
     }
 }