diff options
| author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2023-06-06 18:22:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 18:22:08 +0200 |
| commit | 26b55f9e86dd906f7a5a0b1f10a773e7f2834eef (patch) | |
| tree | 6b54b52878c1164fe735d9111b14f0e5b9563179 /src/main | |
| parent | 6b619fc2e0f57e04796da10911047635e7d9a6a0 (diff) | |
| download | GT5-Unofficial-26b55f9e86dd906f7a5a0b1f10a773e7f2834eef.tar.gz GT5-Unofficial-26b55f9e86dd906f7a5a0b1f10a773e7f2834eef.tar.bz2 GT5-Unofficial-26b55f9e86dd906f7a5a0b1f10a773e7f2834eef.zip | |
Add a toggle to queen insertion (#2064)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java | 20 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/lang/en_US.lang | 3 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java index d4a32e13b8..565ca4356d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java @@ -129,6 +129,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM public int mSpeed = 0; public boolean mLockedSpeed = true; + public boolean mAutoQueen = true; private ItemStack usedQueen = null; private IBee usedQueenBee = null; @@ -635,9 +636,10 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM if (aBaseMetaTileEntity.addStackToSlot(queen, mOutputItems[i])) break; } else if (beeRoot.isMember(mOutputItems[i], EnumBeeType.DRONE.ordinal())) if (aBaseMetaTileEntity.addStackToSlot(drone, mOutputItems[i])) break; - } else - if (i == 0 && j == 0 && beeRoot.isMember(mOutputItems[0], EnumBeeType.QUEEN.ordinal())) - if (aBaseMetaTileEntity.addStackToSlot(queen, mOutputItems[0])) break; + } else if (mAutoQueen && i == 0 + && j == 0 + && beeRoot.isMember(mOutputItems[0], EnumBeeType.QUEEN.ordinal()) + && aBaseMetaTileEntity.addStackToSlot(queen, mOutputItems[0])) break; if (aBaseMetaTileEntity .addStackToSlot(getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i])) break; @@ -1139,7 +1141,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM SPEED_LOCKED_TOOLTIP = "GT5U.machines.industrialapiary.speedlocked.tooltip", INFO_TOOLTIP = "GT5U.machines.industrialapiary.info.tooltip", INFO_WITH_BEE_TOOLTIP = "GT5U.machines.industrialapiary.infoextended.tooltip", - UPGRADE_TOOLTIP = "GT5U.machines.industrialapiary.upgradeslot.tooltip"; + UPGRADE_TOOLTIP = "GT5U.machines.industrialapiary.upgradeslot.tooltip", + AUTOQUEEN_TOOLTIP = "GT5U.machines.industrialapiary.autoqueen.tooltip"; @Override public boolean useModularUI() { @@ -1183,6 +1186,15 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM .setPos(7, 26) .setSize(18, 18)) .widget( + new CycleButtonWidget().setToggle(() -> mAutoQueen, x -> mAutoQueen = x) + .setTextureGetter( + i -> i == 0 ? GT_UITextures.OVERLAY_BUTTON_CROSS : GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .setGTTooltip(() -> mTooltipCache.getData(AUTOQUEEN_TOOLTIP)) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(7, 44) + .setSize(18, 18) + .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_SLOT_BEE_QUEEN)) + .widget( new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION) .setGTTooltip(() -> { final String energyreq = GT_Utility.formatNumbers( diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index a8a15454c0..4923300d15 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -193,6 +193,9 @@ GT5U.machines.industrialapiary.infoextended.tooltip.5=Flowering Chance: %6$d %% GT5U.machines.industrialapiary.infoextended.tooltip.6=Lifespan Modifier: %7$d %% GT5U.machines.industrialapiary.infoextended.tooltip.7=Territory: %8$d x %9$d x %10$d GT5U.machines.industrialapiary.upgradeslot.tooltip=Upgrade slot +GT5U.machines.industrialapiary.autoqueen.tooltip=Automatically put the queen after breeding in the input slot +GT5U.machines.industrialapiary.autoqueen.tooltip.1=§7Doesn't require automation upgrade +GT5U.machines.industrialapiary.autoqueen.tooltip.2=§7§oThis option is ignored if automation upgrade is installed GT5U.machines.advdebugstructurewriter.tooltip=Scans Blocks Around GT5U.machines.advdebugstructurewriter.tooltip.1=Prints Multiblock NonTE structure check code GT5U.machines.advdebugstructurewriter.tooltip.2=ABC axes aligned to machine front |