diff options
| author | Rose <awoonar.dust@gmail.com> | 2023-09-28 12:06:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 19:06:06 +0200 |
| commit | a2448d0cb290cf90534fbf39f6aa0429ad1590fe (patch) | |
| tree | dd65ab060ba93aac1f6b18d9111a9405cff6c7e5 /src/main/java/gtPlusPlus/xmod/gregtech/common | |
| parent | 0209cf0c2610cdac0a8a379454340c0481f36466 (diff) | |
| download | GT5-Unofficial-a2448d0cb290cf90534fbf39f6aa0429ad1590fe.tar.gz GT5-Unofficial-a2448d0cb290cf90534fbf39f6aa0429ad1590fe.tar.bz2 GT5-Unofficial-a2448d0cb290cf90534fbf39f6aa0429ad1590fe.zip | |
Addition for disabling harvest on crop manager (#756)
* Addition for disabling harvest on crop manager
* Fix for incorrect NBT loading
* Applied spotless
* Spotless applied
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java | 11 |
1 files changed, 11 insertions, 0 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 a0ecde949c..1d8d3a42d3 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 @@ -53,6 +53,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank private static final int SLOT_OUTPUT_START = 7; public boolean mModeAlternative = false; + public boolean mHarvestEnabled = true; public GT_MetaTileEntity_CropHarvestor(final int aID, final int aTier, final String aDescription) { super( @@ -242,6 +243,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank if (aCrop == null) continue; if (this.mModeAlternative) processSecondaryFunctions(tCrop); + if (!this.mHarvestEnabled) break; if (aCrop.canBeHarvested(tCrop) && tCrop.getSize() == aCrop.getOptimalHavestSize(tCrop)) { if (!getBaseMetaTileEntity().decreaseStoredEnergyUnits(powerUsage(), true)) continue; @@ -630,12 +632,16 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); aNBT.setBoolean("mModeAlternative", this.mModeAlternative); + aNBT.setBoolean("mHarvestEnabled", this.mHarvestEnabled); } @Override public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); this.mModeAlternative = aNBT.getBoolean("mModeAlternative"); + if (aNBT.hasKey("mHarvestEnabled")) { + this.mHarvestEnabled = aNBT.getBoolean("mHarvestEnabled"); + } } @Override @@ -652,6 +658,11 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank .addTooltip(1, "Disable Hydration/Fertilizing/Weed-EX") .setBackground(GT_UITextures.BUTTON_STANDARD).setPos(47, 63).setSize(18, 18)); builder.widget( + new CycleButtonWidget().setToggle(() -> mHarvestEnabled, val -> mHarvestEnabled = val) + .setTexture(GTPP_UITextures.OVERLAY_BUTTON_HARVESTER_TOGGLE).addTooltip(0, "Enable Harvest") + .addTooltip(1, "Disable Harvest").setBackground(GT_UITextures.BUTTON_STANDARD).setPos(67, 63) + .setSize(18, 18)); + builder.widget( SlotGroup .ofItemHandler(inventoryHandler, 2).startFromSlot( SLOT_WEEDEX_1) |