diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multiblock')
2 files changed, 16 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalReactor.java index e9db6c2256..38152869e4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/AdvChemicalReactor.java @@ -78,9 +78,12 @@ public class AdvChemicalReactor extends ComplexParallelController<AdvChemicalRea } processFluidWhiteLists.add(processFluidTanks); } - processingLogic = new ComplexParallelProcessingLogic( - GT_Recipe.GT_Recipe_Map_LargeChemicalReactor.sChemicalRecipes, - MAX_PROCESSES); + processingLogic = new ComplexParallelProcessingLogic(getRecipeMap(), MAX_PROCESSES); + } + + @Override + public GT_Recipe.GT_Recipe_Map getRecipeMap() { + return GT_Recipe.GT_Recipe_Map_LargeChemicalReactor.sChemicalRecipes; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java index 4a84c1503f..046bb4a114 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java @@ -4,10 +4,14 @@ import static gregtech.api.enums.Mods.Railcraft; import static net.minecraftforge.oredict.OreDictionary.getOreID; import static net.minecraftforge.oredict.OreDictionary.getOreIDs; +import javax.annotation.Nonnull; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import gregtech.api.logic.ProcessingLogic; +import gregtech.api.recipe.check.CheckRecipeResult; +import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -24,21 +28,22 @@ public class CokeOvenProcessingLogic extends ProcessingLogic { private int timeMultiplier = 1; @Override - public boolean process() { + public @Nonnull CheckRecipeResult process() { if (inputItems == null || inputItems[0] == null) { - return false; + return CheckRecipeResultRegistry.NO_RECIPE; } ItemStack input = inputItems[0]; int originalStackSize = input.stackSize; ItemStack output = findRecipe(input); if (currentOutputItems != null && currentOutputItems[0] != null && !currentOutputItems[0].isItemEqual(output)) { - return false; + return CheckRecipeResultRegistry.NO_RECIPE; } input.stackSize -= 1; - setDuration((long) NORMAL_RECIPE_TIME * timeMultiplier); + setDuration(NORMAL_RECIPE_TIME * timeMultiplier); setOutputItems(output); - return originalStackSize > input.stackSize; + return originalStackSize > input.stackSize ? CheckRecipeResultRegistry.SUCCESSFUL + : CheckRecipeResultRegistry.NO_RECIPE; } protected ItemStack findRecipe(ItemStack input) { |