From 389cf2efbcda7b9732fa74387fe2eeaffb239575 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 8 Aug 2022 14:37:05 +0300 Subject: [PATCH] Greenhouse can harvest glow berries. Closes #2577 --- .../tier1/GreenhouseControllerBlockEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java index 0820815f7..ad3dfdf1a 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java @@ -27,6 +27,7 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.server.world.ServerWorld; import net.minecraft.state.property.IntProperty; import net.minecraft.state.property.Properties; @@ -131,6 +132,16 @@ public class GreenhouseControllerBlockEntity extends PowerAcceptorBlockEntity world.setBlockState(blockPos.up(y), blockState.with(BlockRubberLog.HAS_SAP, false).with(BlockRubberLog.SAP_SIDE, Direction.fromHorizontal(0))); } } + } else if (block instanceof CaveVines){ + for (int y=0; (blockState = world.getBlockState(blockPos.up(y))).getBlock() instanceof CaveVines; y++){ + if (blockState.get(Properties.BERRIES) + && (getStored() > TechRebornConfig.greenhouseControllerEnergyPerHarvest) + && insertIntoInv(Collections.singletonList(new ItemStack(Items.GLOW_BERRIES, 1))) + ){ + useEnergy(TechRebornConfig.greenhouseControllerEnergyPerHarvest); + world.setBlockState(blockPos.up(y), blockState.with(Properties.BERRIES, false)); + } + } } }