drop some features for GregTech 2.4.3 compat

Author: Quarri6343

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.12.2-1.8.0"
+version = "1.12.2-1.8.1"
 group = "bruberu"
 archivesBaseName = "GregTech Food Option"
 

libs/gregtech-1.12.2-2.4.0-gcys-alpha.jar libs/gregtech-1.12.2-2.4.3-beta.jarlibs/gregtech-1.12.2-2.4.0-gcys-alpha.jar renamed to libs/gregtech-1.12.2-2.4.3-beta.jar

@@ -0,0 +1,102 @@
+package com.cleanroommc.groovyscript.api;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.Ingredient;
+import net.minecraftforge.fluids.FluidStack;
+
+import javax.annotation.Nullable;
+import java.util.function.Predicate;
+
+/**
+ * Base ingredient class for every ingredient. Most useful for item stacks and ore dicts.
+ */
+public interface IIngredient extends IResourceStack, Predicate<ItemStack> {
+
+    IIngredient exactCopy();
+
+    Ingredient toMcIngredient();
+
+    ItemStack[] getMatchingStacks();
+
+    default ItemStack applyTransform(ItemStack matchedInput) {
+        return matchedInput.getItem().hasContainerItem(matchedInput) ? matchedInput.getItem().getContainerItem(matchedInput) : ItemStack.EMPTY;
+    }
+
+    default boolean test(FluidStack fluidStack) {
+        return false;
+    }
+
+    /**
+     * An empty ingredient with stack size 0, that matches empty item stacks
+     */
+    IIngredient EMPTY = new IIngredient() {
+        @Override
+        public int getAmount() {
+            return 0;
+        }
+
+        @Override
+        public void setAmount(int amount) {
+        }
+
+        @Override
+        public IIngredient exactCopy() {
+            return this;
+        }
+
+        @Override
+        public Ingredient toMcIngredient() {
+            return Ingredient.EMPTY;
+        }
+
+        @Override
+        public ItemStack[] getMatchingStacks() {
+            return new ItemStack[]{ItemStack.EMPTY};
+        }
+
+        @Override
+        public boolean test(ItemStack stack) {
+            return stack.isEmpty();
+        }
+    };
+
+    /**
+     * An ingredient with stack size 1, that matches any item stack
+     */
+    IIngredient ANY = new IIngredient() {
+
+        @Override
+        public IIngredient exactCopy() {
+            return this;
+        }
+
+        @Override
+        public Ingredient toMcIngredient() {
+            return new Ingredient() {
+                @Override
+                public boolean apply(@Nullable ItemStack p_apply_1_) {
+                    return true;
+                }
+            };
+        }
+
+        @Override
+        public ItemStack[] getMatchingStacks() {
+            return new ItemStack[0];
+        }
+
+        @Override
+        public int getAmount() {
+            return 1;
+        }
+
+        @Override
+        public void setAmount(int amount) {
+        }
+
+        @Override
+        public boolean test(ItemStack stack) {
+            return true;
+        }
+    };
+}

src/api/java/com/cleanroommc/groovyscript/api/IIngredient.java

@@ -0,0 +1,24 @@
+package com.cleanroommc.groovyscript.api;
+
+/**
+ * An object that has an amount.
+ * Can use '*' in groovy to set amount.
+ */
+public interface IResourceStack {
+
+    int getAmount();
+
+    void setAmount(int amount);
+
+    default IResourceStack withAmount(int amount) {
+        setAmount(amount);
+        return this;
+    }
+
+    /**
+     * enables groovy to use '*' operator
+     */
+    default IResourceStack multiply(Number n) {
+        return withAmount(n.intValue());
+    }
+}

src/api/java/com/cleanroommc/groovyscript/api/IResourceStack.java

@@ -35,11 +35,6 @@ public MetaTileEntityBakingOven(ResourceLocation metaTileEntityId) {
         super(metaTileEntityId, GTFORecipeMaps.BAKING_OVEN_RECIPES);
     }
 
-    @Override
-    public int getLightValueForPart(IMultiblockPart sourcePart) {
-        return sourcePart == null && recipeMapWorkable.isActive() ? 15 : 0;
-    }
-
     protected IBlockState getCasingState() {
         return GTFOMetaBlocks.GTFO_CASING.getState(GTFOBlockCasing.CasingType.ADOBE_BRICKS);
     }

src/main/java/gregtechfoodoption/machines/multiblock/MetaTileEntityBakingOven.java

@@ -318,11 +318,6 @@ public boolean checkRecipe(Recipe recipe, boolean consumeIfSuccess) {
         return recipe.getProperty(ElectricBakingOvenRecipeBuilder.TemperatureProperty.getInstance(), 0) == temp;
     }
 
-    @Override
-    public int getLightValueForPart(IMultiblockPart sourcePart) {
-        return sourcePart == null && temp > 300 ? 15 : 0;
-    }
-
     private class ElectricBakingOvenLogic extends MultiblockRecipeLogic {
         public ElectricBakingOvenLogic(RecipeMapMultiblockController tileEntity) {
             super(tileEntity);

src/main/java/gregtechfoodoption/machines/multiblock/MetaTileEntityElectricBakingOven.java

@@ -10,6 +10,7 @@
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.ore.OrePrefix.dust;
 import static gregtechfoodoption.GTFOMaterialHandler.*;
+import static gregtechfoodoption.GTFOMaterialHandler.ArsenicTrioxide;
 
 // It's alive...
 public class DyeChain {