diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
2 files changed, 22 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 41ba313b0e..39666a2d3b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.requireControlCores; import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; import java.lang.reflect.InvocationTargetException; @@ -198,7 +199,7 @@ GT_MetaTileEntity_MultiBlockBase { } } - int tTier = this.getControlCoreTier(); + int tTier = requireControlCores ? this.getControlCoreTier() : -1; mInfo.add(getMachineTooltip()); @@ -502,7 +503,7 @@ GT_MetaTileEntity_MultiBlockBase { int aControlCoreTier = getControlCoreTier(); //If no core, return false; - if (aControlCoreTier == 0) { + if (aControlCoreTier == 0 && requireControlCores) { log("No control core found."); return false; } @@ -519,7 +520,7 @@ GT_MetaTileEntity_MultiBlockBase { log("Running checkRecipeGeneric(0)"); //Check to see if Voltage Tier > Control Core Tier - if (tTier > aControlCoreTier) { + if (tTier > aControlCoreTier && requireControlCores) { log("Control core found is lower tier than power tier."); return false; } @@ -586,7 +587,7 @@ GT_MetaTileEntity_MultiBlockBase { //Only Overclock as high as the control circuit. byte tTierOld = tTier; - tTier = (byte) aControlCoreTier; + tTier = requireControlCores ? (byte) aControlCoreTier : tTierOld; // Overclock if (this.mEUt <= 16) { @@ -888,7 +889,14 @@ GT_MetaTileEntity_MultiBlockBase { return false; } - public int getControlCoreTier() { + public int getControlCoreTier() { + + //Always return best tier if config is off. + boolean aCoresConfig = gtPlusPlus.core.lib.CORE.ConfigSwitches.requireControlCores; + if (!aCoresConfig) { + return 10; + } + if (mControlCoreBus.isEmpty()) { log("No Control Core Modules Found."); return 0; @@ -1499,7 +1507,10 @@ GT_MetaTileEntity_MultiBlockBase { public final boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { boolean aStructureCheck = checkMultiblock(aBaseMetaTileEntity, aStack); - boolean aHasCore = this.getControlCoreBus() != null; + + boolean aCoresConfig = gtPlusPlus.core.lib.CORE.ConfigSwitches.requireControlCores; + + boolean aHasCore = (aCoresConfig ? (this.getControlCoreBus() != null) : true); return aStructureCheck && aHasCore; } 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) { |