Remove CrT workarounds now that a few issues have been fixed

Author: pupnewfster

gradle.properties

@@ -37,7 +37,7 @@ yamlops_version=1.2.0
 
 #Mod dependencies
 cc_tweaked_version=1.111.0
-crafttweaker_version=19.0.3
+crafttweaker_version=19.0.7
 curios_version=8.0.0-beta.5+1.20.6
 emi_version=1.1.6
 jade_api_id=5288706

src/main/java/mekanism/common/integration/crafttweaker/CrTRecipeComponents.java

@@ -3,7 +3,6 @@
 import com.blamejared.crafttweaker.api.fluid.CTFluidIngredient;
 import com.blamejared.crafttweaker.api.fluid.IFluidStack;
 import com.blamejared.crafttweaker.api.ingredient.IIngredientWithAmount;
-import com.blamejared.crafttweaker.api.ingredient.type.IIngredientEmpty;
 import com.blamejared.crafttweaker.api.item.IItemStack;
 import com.blamejared.crafttweaker.api.recipe.component.BuiltinRecipeComponents;
 import com.blamejared.crafttweaker.api.recipe.component.DecomposedRecipeBuilder;
@@ -59,29 +58,10 @@ private CrTRecipeComponents() {
           FloatingLong::equals
     );
 
-    public static final PairedRecipeComponent<IIngredientWithAmount, IItemStack> ITEM = new PairedRecipeComponent<>(IRecipeComponent.composite(
-          Mekanism.rl("input/item"),
-          new TypeToken<>() {},
-          (a, b) -> Objects.equals(a, b) || a.amount() == b.amount() && RecipeComponentEqualityCheckers.areIngredientsEqual(a.ingredient(), b.ingredient()),
-          Collections::singletonList,
-          ingredients -> {
-              if (ingredients.isEmpty()) {
-                  return IIngredientEmpty.getInstance().asIIngredientWithAmount();
-              }
-              IIngredientWithAmount acc = null;
-              for (IIngredientWithAmount ingredient : ingredients) {
-                  if (acc == null) {
-                      acc = ingredient;
-                  } else {
-                      if (acc.amount() != ingredient.amount()) {
-                          throw new IllegalArgumentException("Amount mismatch");
-                      }
-                      acc = acc.ingredient().or(ingredient.ingredient()).mul(acc.amount());
-                  }
-              }
-              return acc;
-          }
-    ), BuiltinRecipeComponents.Output.ITEMS);
+    public static final PairedRecipeComponent<IIngredientWithAmount, IItemStack> ITEM = new PairedRecipeComponent<>(
+          BuiltinRecipeComponents.Input.INGREDIENTS_WITH_AMOUNTS,
+          BuiltinRecipeComponents.Output.ITEMS
+    );
     public static final PairedRecipeComponent<CTFluidIngredient, IFluidStack> FLUID = new PairedRecipeComponent<>(
           BuiltinRecipeComponents.Input.FLUID_INGREDIENTS,
           BuiltinRecipeComponents.Output.FLUIDS

src/main/java/mekanism/common/integration/crafttweaker/CrTUtils.java

@@ -50,8 +50,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.material.Fluid;
 import net.neoforged.neoforge.fluids.FluidStack;
-import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;
-import net.neoforged.neoforge.fluids.crafting.TagFluidIngredient;
 import org.jetbrains.annotations.Nullable;
 
 public class CrTUtils {
@@ -157,12 +155,6 @@ public static FluidStackIngredient fromCrT(CTFluidIngredient ingredient) {
      * Converts one of our fluid ingredients to a CrT fluid ingredient.
      */
     public static CTFluidIngredient toCrT(FluidStackIngredient ingredient) {
-        SizedFluidIngredient sizedIngredient = ingredient.ingredient();
-        if (sizedIngredient.ingredient() instanceof TagFluidIngredient tagIngredient) {
-            return new CTFluidIngredient.FluidTagWithAmountIngredient(fluidTags().tag(tagIngredient.tag()).withAmount(sizedIngredient.amount()));
-        }
-        //TODO - 1.20.5: Switch to using just this, instead of special casing ingredients once it gets fixed in CrT
-        // if it doesn't get fixed we need to add support for converting tag ingredients that are part of a compound fluid ingredient
         return ExpandSizedFluidIngredient.asCTFluidIngredient(ingredient.ingredient());
     }
 

src/main/java/mekanism/common/integration/crafttweaker/MekCraftTweakerPlugin.java

@@ -34,8 +34,6 @@ public void registerModuleConfigurators(IScriptRunModuleConfiguratorRegistration
     @Override
     public void registerRecipeComponents(IRecipeComponentRegistrationHandler handler) {
         //Input/Output
-        //Note: We only register the input for items as the output uses the one built into crafttweaker
-        handler.registerRecipeComponent(CrTRecipeComponents.ITEM.input());
         for (ChemicalRecipeComponent<?, ?, ?, ?> chemicalComponent : CrTRecipeComponents.CHEMICAL_COMPONENTS) {
             handler.registerRecipeComponent(chemicalComponent.input());
             handler.registerRecipeComponent(chemicalComponent.output());