diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2022-01-13 00:55:55 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2022-01-13 00:55:55 +0000 |
| commit | 87b3fdb080ad0409d9593e09f4206e5d70c78756 (patch) | |
| tree | 0d15bfaf6f7301dc2c8efac1bcb8a59c154d1045 /src/main/java/gtPlusPlus/xmod/gregtech | |
| parent | 0540e62299cb368a3c430493da0327dba1cf23f1 (diff) | |
| download | GT5-Unofficial-87b3fdb080ad0409d9593e09f4206e5d70c78756.tar.gz GT5-Unofficial-87b3fdb080ad0409d9593e09f4206e5d70c78756.tar.bz2 GT5-Unofficial-87b3fdb080ad0409d9593e09f4206e5d70c78756.zip | |
Change Crop Manager power usage based on feedback.
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java index 678ca46204..01d5ef88c8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java @@ -182,6 +182,14 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank } return false; } + + public long powerUsage() { + return this.maxEUInput() / 8; + } + + public long powerUsageSecondary() { + return this.maxEUInput() / 32; + } @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { @@ -226,7 +234,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank if (aCrop != null) { //Logger.INFO("Found "+aCrop.displayName()+" at offset "+x+", "+y+", "+z); if (!aCrop.canGrow(tCrop) && aCrop.canBeHarvested(tCrop)) { - if (getBaseMetaTileEntity().decreaseStoredEnergyUnits(maxEUInput(), true)) { + if (getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsage(), true)) { ItemStack[] aHarvest = tCrop.harvest_automated(true); if (aHarvest != null && aHarvest.length > 0) { for (ItemStack aStack : aHarvest) { @@ -342,15 +350,15 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank if (!mModeAlternative) { return; } - if (hasFertilizer() && consumeFertilizer(true) && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(maxEUInput(), true) && applyFertilizer(aCrop)) { + if (hasFertilizer() && consumeFertilizer(true) && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true) && applyFertilizer(aCrop)) { if (consumeFertilizer(false)) { //Logger.INFO("Consumed Fert."); } } - if (this.getFluidAmount() > 0 && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(maxEUInput(), true) && applyHydration(aCrop)) { + if (this.getFluidAmount() > 0 && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true) && applyHydration(aCrop)) { //Logger.INFO("Consumed Water."); } - if (hasWeedEX() && consumeWeedEX(true) && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(maxEUInput(), true) && applyWeedEx(aCrop)) { + if (hasWeedEX() && consumeWeedEX(true) && this.getBaseMetaTileEntity().getUniversalEnergyStored() >= getMinimumStoredEU() && getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsageSecondary(), true) && applyWeedEx(aCrop)) { if (consumeWeedEX(false)) { //Logger.INFO("Consumed Weed-EX."); } @@ -507,7 +515,8 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank return new String[] { this.mDescription, "Secondary mode can Hydrate/Fertilize/Weed-EX", - "Consumes "+maxEUInput()+"eu per harvest", + "Consumes "+powerUsage()+"eu per harvest", + "Consumes "+powerUsageSecondary()+"eu per secondary operation", "Can harvest 2 blocks above", "Radius: "+aSide+" each side ("+aRadius+"x3x"+aRadius+")", "Has "+(mTier * 5)+"% chance for extra drops", |