Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug in macerator recipes. (#1468)

Browse source
This commit is contained in:
Dimach 2018-10-07 19:04:47 +03:00 committed by Blood-Asp
parent d3c43ea90b
commit b46a466878
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
View file

@ -13,6 +13,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility; import gregtech.api.util.GT_Utility;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import java.util.Random; import java.util.Random;
@ -58,10 +59,11 @@ public class GT_MetaTileEntity_Macerator_Bronze
mOutputBlocked++; mOutputBlocked++;
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
} }
if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs()))
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0); if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);
this.mEUt = tRecipe.mEUt; this.mEUt = tRecipe.mEUt;
this.mMaxProgresstime = (tRecipe.mDuration * 2); this.mMaxProgresstime = (tRecipe.mDuration * 2);
getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize;
return FOUND_AND_SUCCESSFULLY_USED_RECIPE; return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
} }

4
src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
View file

@ -13,6 +13,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility; import gregtech.api.util.GT_Utility;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import java.util.Random; import java.util.Random;
@ -58,10 +59,11 @@ public class GT_MetaTileEntity_Macerator_Steel
mOutputBlocked++; mOutputBlocked++;
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
} }
if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs()))
return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0); if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);
this.mEUt = (3 * tRecipe.mEUt); this.mEUt = (3 * tRecipe.mEUt);
this.mMaxProgresstime = tRecipe.mDuration; this.mMaxProgresstime = tRecipe.mDuration;
getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize;
return FOUND_AND_SUCCESSFULLY_USED_RECIPE; return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
} }