From 30cb48fea9bd712a7b20a4a06943e83198096cbf Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Sun, 1 Dec 2019 14:10:58 +0100 Subject: adv vacuumfreezer working the same as advEBF --- src/Java/gtPlusPlus/GTplusplus.java | 26 +++++++++++----------- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 16 +++++++++++++ 2 files changed, 29 insertions(+), 13 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 8c8b973dc9..135f82cbcb 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -369,20 +369,20 @@ public class GTplusplus implements ActionListener { mOriginalCount[2] = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList.size(); for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) { if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) { - int mTime = (x.mDuration/2); - int len = x.mFluidInputs.length; - FluidStack[] y = new FluidStack[len + 1]; - int slot = y.length - 1; - int mr3 = 0; - for (FluidStack f : x.mFluidInputs) { - if (f != null) { - y[mr3] = f; - } - mr3++; - } - y[slot] = FluidUtils.getFluidStack("cryotheum", mTime); + // int mTime = (x.mDuration/2); + // int len = x.mFluidInputs.length; + // FluidStack[] y = new FluidStack[len + 1]; + // int slot = y.length - 1; + // int mr3 = 0; + // for (FluidStack f : x.mFluidInputs) { + // if (f != null) { + // y[mr3] = f; + // } + // mr3++; + // } + //y[slot] = FluidUtils.getFluidStack("cryotheum", mTime); if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) { - if (CORE.RA.addAdvancedFreezerRecipe(x.mInputs, y, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) { + if (CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) { mValidCount[2]++; } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index 064dc8372b..82de41f186 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -184,6 +184,8 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta return false; } + private volatile int mGraceTimer = 2; + @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { /*if (this.getBaseMetaTileEntity().isActive()) { @@ -192,5 +194,19 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta } } */ super.onPostTick(aBaseMetaTileEntity, aTick); + + if (this.mStartUpCheck < 0) { + if (this.mMaxProgresstime > 0 && this.mProgresstime != 0 || this.getBaseMetaTileEntity().hasWorkJustBeenEnabled()) { + if (aTick % 10 == 0 || this.getBaseMetaTileEntity().hasWorkJustBeenEnabled()) { + if (!this.depleteInput(FluidUtils.getFluidStack("cryotheum", 10))) { + if (mGraceTimer-- == 0) { + this.causeMaintenanceIssue(); + this.stopMachine(); + mGraceTimer = 2; + } + } + } + } + } } } \ No newline at end of file -- cgit From 05040ca782db7249db92f8d5e5249850cf79ab13 Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Sun, 1 Dec 2019 14:11:51 +0100 Subject: fix where advebf would still run even without pyro --- .../multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 4d38e686cf..cce1d5b530 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -420,6 +420,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase if (mGraceTimer-- == 0) { this.causeMaintenanceIssue(); this.stopMachine(); + mGraceTimer = 2; } } } -- cgit From 848bf971ce31925e6711133c35cc7632cdc5ca34 Mon Sep 17 00:00:00 2001 From: korneel vandamme Date: Sun, 1 Dec 2019 14:16:21 +0100 Subject: remove comented code --- src/Java/gtPlusPlus/GTplusplus.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 135f82cbcb..0a43e16519 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -368,19 +368,7 @@ public class GTplusplus implements ActionListener { //Advanced Vacuum Freezer generation mOriginalCount[2] = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList.size(); for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) { - if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) { - // int mTime = (x.mDuration/2); - // int len = x.mFluidInputs.length; - // FluidStack[] y = new FluidStack[len + 1]; - // int slot = y.length - 1; - // int mr3 = 0; - // for (FluidStack f : x.mFluidInputs) { - // if (f != null) { - // y[mr3] = f; - // } - // mr3++; - // } - //y[slot] = FluidUtils.getFluidStack("cryotheum", mTime); + if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) { if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) { if (CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) { mValidCount[2]++; -- cgit