From 975a89ea5bf7df5008131ab43e42a3a97a1bee2c Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Wed, 10 Aug 2022 07:14:16 +0200 Subject: Industrial Apiary Fixes (#1225) * Upgrade slot tooltip * Fix Hellish biomes temperature * Princess -> Queen process is always automated --- .../machines/basic/GT_MetaTileEntity_IndustrialApiary.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') 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 de41e5bc17..faa1df8ebe 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 @@ -439,7 +439,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM for (int i = 0; i < mOutputItems.length; i++) if(mOutputItems[i] != null) for (int j = 0; j < mOutputItems.length; j++) { - if(isAutomated) + if(j == 0 && isAutomated) { if(beeRoot.isMember(mOutputItems[i], EnumBeeType.QUEEN.ordinal()) || beeRoot.isMember(mOutputItems[i], EnumBeeType.PRINCESS.ordinal())) { if(aBaseMetaTileEntity.addStackToSlot(queen, mOutputItems[i])) @@ -449,6 +449,9 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM 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; if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i])) break; } @@ -604,7 +607,10 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM @Override public EnumTemperature getTemperature() { - return EnumTemperature.getFromValue(getBiome().temperature + temperatureMod); + if(BiomeHelper.isBiomeHellish(getBiome())) + return EnumTemperature.HELLISH; + return + EnumTemperature.getFromValue(getBiome().temperature + temperatureMod); } @Override -- cgit