diff options
| author | huajijam <strhuaji@gmail.com> | 2019-01-31 19:32:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 19:32:46 +0800 |
| commit | 3b3a7738b615d2a307f80bfe079f6d56d48b6521 (patch) | |
| tree | e2e7ead0e42e458adde896c090e558bb4e250c43 /src/Java/gtPlusPlus/xmod/gregtech/common/tileentities | |
| parent | 9ed780d285420a4e4a1c4c291e49da9c894f1d31 (diff) | |
| parent | d015262242110df899f6ffe7a9f84780382e8584 (diff) | |
| download | GT5-Unofficial-3b3a7738b615d2a307f80bfe079f6d56d48b6521.tar.gz GT5-Unofficial-3b3a7738b615d2a307f80bfe079f6d56d48b6521.tar.bz2 GT5-Unofficial-3b3a7738b615d2a307f80bfe079f6d56d48b6521.zip | |
update
update
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities')
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index 022dcaaef2..eb6a9bfcd3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -638,7 +638,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); } - @Override public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { this.mSaveRotor = Utils.invertBoolean(mSaveRotor); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index 17e6430f99..f88065d9a9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -21,6 +21,7 @@ import gregtech.api.util.Recipe_GT; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -516,7 +517,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GregtechMeta_M int aControlCoreTier = getControlCoreTier(); //If no core, return false; - if (aControlCoreTier == 0) { + if (aControlCoreTier == 0 && CORE.ConfigSwitches.requireControlCores) { log("Invalid/No Control Core"); return false; } @@ -533,7 +534,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GregtechMeta_M log("Running checkRecipeGeneric(0)"); //Check to see if Voltage Tier > Control Core Tier - if (tTier > aControlCoreTier) { + if (tTier > aControlCoreTier && CORE.ConfigSwitches.requireControlCores) { return false; } @@ -548,7 +549,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GregtechMeta_M ItemStack[] mFishOutput = generateLoot(this.mMode); mFishOutput = removeNulls(mFishOutput); - GT_Recipe g = new Recipe_GT(true, new ItemStack[] {}, mFishOutput, null, new int[] {}, aFluidInputs, mOutputFluids, 100, 8, 0); + GT_Recipe g = new Recipe_GT(true, new ItemStack[] {}, mFishOutput, null, new int[] {}, aFluidInputs, mOutputFluids, 100, 16, 0); if (!this.canBufferOutputs(g, aMaxParallelRecipes)) { log("No Space"); return false; @@ -606,7 +607,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GregtechMeta_M //Only Overclock as high as the control circuit. byte tTierOld = tTier; - tTier = (byte) aControlCoreTier; + tTier = CORE.ConfigSwitches.requireControlCores ? (byte) aControlCoreTier : tTierOld; // Overclock if (this.mEUt <= 16) { |