From a0fb568144c2451cbf7481e63fa1ae4437ec168c Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 18 Mar 2016 23:54:36 +0100 Subject: [PATCH] Add Greenhous Helper and State --- .../greenhouse/DefaultGreenhouseLogic.java | 2 +- .../api/greenhouse/IGreenhouseHelper.java | 15 +++++ .../api/greenhouse/IGreenhouseLogic.java | 2 +- .../api/greenhouse/IGreenhouseState.java | 24 ++++++++ .../java/forestry/core/blocks/BlockSoil.java | 2 +- .../forestry/greenhouse/GreenhouseHelper.java | 37 +++++++++++++ .../forestry/greenhouse/GreenhouseState.java | 55 +++++++++++++++++++ .../greenhouse/logics/GreenhouseEffect.java | 2 +- .../multiblock/GreenhouseController.java | 11 ++++ 9 files changed, 146 insertions(+), 4 deletions(-) create mode 100644 src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java create mode 100644 src/main/java/forestry/api/greenhouse/IGreenhouseState.java create mode 100644 src/main/java/forestry/greenhouse/GreenhouseHelper.java create mode 100644 src/main/java/forestry/greenhouse/GreenhouseState.java diff --git a/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java b/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java index dcfd4a977..f97d83061 100644 --- a/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java +++ b/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java @@ -27,7 +27,7 @@ public class DefaultGreenhouseLogic implements IGreenhouseLogic { } @Override - public void onWork() { + public void work() { } @Override diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java b/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java new file mode 100644 index 000000000..bc6a2b461 --- /dev/null +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +package forestry.api.greenhouse; + +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; + +public interface IGreenhouseHelper { + + IGreenhouseState getGreenhouseState(World world, BlockPos pos); + +} diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseLogic.java b/src/main/java/forestry/api/greenhouse/IGreenhouseLogic.java index 4091f6195..6943f4143 100644 --- a/src/main/java/forestry/api/greenhouse/IGreenhouseLogic.java +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseLogic.java @@ -16,7 +16,7 @@ import forestry.api.multiblock.IGreenhouseController; public interface IGreenhouseLogic extends INbtWritable, INbtReadable { - void onWork(); + void work(); void onChange(EnumGreenhouseChangeType type, Object event); diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseState.java b/src/main/java/forestry/api/greenhouse/IGreenhouseState.java new file mode 100644 index 000000000..77fb36d63 --- /dev/null +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseState.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +package forestry.api.greenhouse; + +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import net.minecraft.world.World; + +public interface IGreenhouseState { + + EnumTemperature getTemperature(); + + EnumHumidity getHumidity(); + + float getExactTemperature(); + + float getExactHumidity(); + + World getWorld(); + +} diff --git a/src/main/java/forestry/core/blocks/BlockSoil.java b/src/main/java/forestry/core/blocks/BlockSoil.java index 7db875825..4a76c88e9 100644 --- a/src/main/java/forestry/core/blocks/BlockSoil.java +++ b/src/main/java/forestry/core/blocks/BlockSoil.java @@ -144,7 +144,7 @@ public class BlockSoil extends Block implements IItemTyped, IItemModelRegister { for (int j = -1; j < 2; j++) { IBlockState state = world.getBlockState(new BlockPos(pos.getX() + i, pos.getY() + 1, pos.getZ() + j)); Block block = state.getBlock(); - if (block == Blocks.log || block == Blocks.sapling || block instanceof IGrowable) { + if (block == Blocks.log || block == Blocks.log2 || block == Blocks.sapling || block instanceof IGrowable) { // We are not returning true if we are the base of a sapling. return !(i == 0 && j == 0); } diff --git a/src/main/java/forestry/greenhouse/GreenhouseHelper.java b/src/main/java/forestry/greenhouse/GreenhouseHelper.java new file mode 100644 index 000000000..3675371f2 --- /dev/null +++ b/src/main/java/forestry/greenhouse/GreenhouseHelper.java @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.greenhouse; + +import forestry.api.greenhouse.IGreenhouseHelper; +import forestry.api.greenhouse.IGreenhouseState; +import forestry.core.multiblock.IMultiblockControllerInternal; +import forestry.core.multiblock.MultiblockRegistry; +import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; + +public class GreenhouseHelper implements IGreenhouseHelper { + + @Override + public IGreenhouseState getGreenhouseState(World world, BlockPos pos) { + for(IMultiblockControllerInternal controllerInternal : MultiblockRegistry.getControllersFromWorld(world)){ + if(controllerInternal instanceof IGreenhouseControllerInternal){ + if(controllerInternal.isAssembled()){ + if(((IGreenhouseControllerInternal) controllerInternal).isInGreenhouse(pos)){ + return ((IGreenhouseControllerInternal) controllerInternal).createState(); + } + } + } + } + return null; + } + +} diff --git a/src/main/java/forestry/greenhouse/GreenhouseState.java b/src/main/java/forestry/greenhouse/GreenhouseState.java new file mode 100644 index 000000000..c3bf4e6f1 --- /dev/null +++ b/src/main/java/forestry/greenhouse/GreenhouseState.java @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.greenhouse; + +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.greenhouse.IGreenhouseState; +import net.minecraft.world.World; + +public class GreenhouseState implements IGreenhouseState { + + private final float humidity; + private final float temperature; + private final World world; + + public GreenhouseState(World world, float humidity, float temperature) { + this.world = world; + this.humidity = humidity; + this.temperature = temperature; + } + + @Override + public EnumTemperature getTemperature() { + return EnumTemperature.getFromValue(temperature); + } + + @Override + public EnumHumidity getHumidity() { + return EnumHumidity.getFromValue(humidity); + } + + @Override + public float getExactTemperature() { + return temperature; + } + + @Override + public float getExactHumidity() { + return humidity; + } + + @Override + public World getWorld() { + return world; + } + +} diff --git a/src/main/java/forestry/greenhouse/logics/GreenhouseEffect.java b/src/main/java/forestry/greenhouse/logics/GreenhouseEffect.java index b2ddf0bfe..6cdb98700 100644 --- a/src/main/java/forestry/greenhouse/logics/GreenhouseEffect.java +++ b/src/main/java/forestry/greenhouse/logics/GreenhouseEffect.java @@ -34,7 +34,7 @@ public class GreenhouseEffect extends DefaultGreenhouseLogic implements IGreenho } @Override - public void onWork() { + public void work() { if(controller == null || !controller.isAssembled()){ return; } diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 2915d59c7..ad6bad67d 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -26,6 +26,7 @@ import forestry.api.core.CamouflageEvents.CamouflageChangeEvent; import forestry.api.greenhouse.EnumGreenhouseChangeType; import forestry.api.greenhouse.GreenhouseManager; import forestry.api.greenhouse.IGreenhouseLogic; +import forestry.api.greenhouse.IGreenhouseState; import forestry.api.core.EnumCamouflageType; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -50,6 +51,7 @@ import forestry.core.tiles.ILiquidTankTile; import forestry.core.utils.CamouflageUtil; import forestry.core.utils.Log; import forestry.energy.EnergyManager; +import forestry.greenhouse.GreenhouseState; import forestry.greenhouse.blocks.BlockGreenhouse; import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.network.packets.PacketCamouflageUpdate; @@ -435,6 +437,10 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im inventory.drainCan(tankManager); } + for(IGreenhouseLogic logic : logics){ + logic.work(); + } + for (IGreenhouseComponent.Active activeComponent : activeComponents) { activeComponent.updateServer(tickCount); } @@ -695,5 +701,10 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im public List getLogics() { return logics; } + + @Override + public IGreenhouseState createState() { + return new GreenhouseState(worldObj, getBiome().rainfall + humidChange, getBiome().temperature + tempChange); + } }