From cd4061b1fe77aa26c984e4531c32c09bb41a5c4e Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 19 Mar 2016 16:11:22 +0100 Subject: [PATCH] Add clima manager and add greenhouse controller to multiblock logic factory --- .../java/forestry/api/core/ForestryAPI.java | 2 + .../forestry/api/core/IClimateManager.java | 17 +++++++ .../multiblock/IMultiblockLogicFactory.java | 2 + .../multiblock/AlvearyController.java | 6 ++- .../java/forestry/core/ClimateManager.java | 44 +++++++++++++++++++ src/main/java/forestry/core/PluginCore.java | 1 + .../multiblock/MultiblockLogicFactory.java | 7 +++ .../farming/multiblock/FarmController.java | 9 ++-- 8 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 src/main/java/forestry/api/core/IClimateManager.java create mode 100644 src/main/java/forestry/core/ClimateManager.java diff --git a/src/main/java/forestry/api/core/ForestryAPI.java b/src/main/java/forestry/api/core/ForestryAPI.java index 92d21ccd0..60deacd25 100644 --- a/src/main/java/forestry/api/core/ForestryAPI.java +++ b/src/main/java/forestry/api/core/ForestryAPI.java @@ -46,6 +46,8 @@ public class ForestryAPI { */ @SideOnly(Side.CLIENT) public static IModelManager modelManager; + + public static IClimateManager climateManager; /** * The currently active {@link IGameMode}. diff --git a/src/main/java/forestry/api/core/IClimateManager.java b/src/main/java/forestry/api/core/IClimateManager.java new file mode 100644 index 000000000..947acc785 --- /dev/null +++ b/src/main/java/forestry/api/core/IClimateManager.java @@ -0,0 +1,17 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +package forestry.api.core; + +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; + +public interface IClimateManager { + + float getTemperature(World world, BlockPos pos); + + float getHumidity(World world, BlockPos pos); + +} diff --git a/src/main/java/forestry/api/multiblock/IMultiblockLogicFactory.java b/src/main/java/forestry/api/multiblock/IMultiblockLogicFactory.java index 50eb52a13..34eb7c629 100644 --- a/src/main/java/forestry/api/multiblock/IMultiblockLogicFactory.java +++ b/src/main/java/forestry/api/multiblock/IMultiblockLogicFactory.java @@ -13,4 +13,6 @@ public interface IMultiblockLogicFactory { IMultiblockLogicAlveary createAlvearyLogic(); IMultiblockLogicFarm createFarmLogic(); + + IMultiblockLogicGreenhouse createGreenhouseLogic(); } diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 7a6ff22c9..435885f99 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -33,6 +33,7 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; import forestry.api.core.IClimateControlled; import forestry.api.multiblock.IAlvearyComponent; import forestry.api.multiblock.IMultiblockComponent; @@ -351,12 +352,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public float getExactTemperature() { BlockPos coords = getReferenceCoord(); - return getBiome().getFloatTemperature(coords) + tempChange; + return ForestryAPI.climateManager.getTemperature(getWorld(), coords) + tempChange; } @Override public float getExactHumidity() { - return getBiome().rainfall + humidChange; + BlockPos coords = getReferenceCoord(); + return ForestryAPI.climateManager.getHumidity(getWorld(), coords) + humidChange; } @Override diff --git a/src/main/java/forestry/core/ClimateManager.java b/src/main/java/forestry/core/ClimateManager.java new file mode 100644 index 000000000..f464801d8 --- /dev/null +++ b/src/main/java/forestry/core/ClimateManager.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * 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.core; + +import forestry.api.core.IClimateManager; +import forestry.api.greenhouse.GreenhouseManager; +import forestry.api.greenhouse.IGreenhouseState; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + +public class ClimateManager implements IClimateManager{ + + @Override + public float getTemperature(World world, BlockPos pos) { + IGreenhouseState state = GreenhouseManager.greenhouseHelper.getGreenhouseState(world, pos); + BiomeGenBase biome = world.getBiomeGenForCoords(pos); + + if(state != null){ + return state.getExactTemperature(); + } + return biome.temperature; + } + + @Override + public float getHumidity(World world, BlockPos pos) { + IGreenhouseState state = GreenhouseManager.greenhouseHelper.getGreenhouseState(world, pos); + BiomeGenBase biome = world.getBiomeGenForCoords(pos); + + if(state != null){ + return state.getExactHumidity(); + } + return biome.rainfall; + } + +} diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index 46f61d1a9..bbcea5f25 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -94,6 +94,7 @@ public class PluginCore extends BlankForestryPlugin { AlleleHelper.instance = new AlleleHelper(); MultiblockManager.logicFactory = new MultiblockLogicFactory(); + ForestryAPI.climateManager = new ClimateManager(); } @Override diff --git a/src/main/java/forestry/core/multiblock/MultiblockLogicFactory.java b/src/main/java/forestry/core/multiblock/MultiblockLogicFactory.java index d60294a3d..72c8f3a45 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockLogicFactory.java +++ b/src/main/java/forestry/core/multiblock/MultiblockLogicFactory.java @@ -13,8 +13,10 @@ package forestry.core.multiblock; import forestry.api.multiblock.IMultiblockLogicAlveary; import forestry.api.multiblock.IMultiblockLogicFactory; import forestry.api.multiblock.IMultiblockLogicFarm; +import forestry.api.multiblock.IMultiblockLogicGreenhouse; import forestry.apiculture.multiblock.MultiblockLogicAlveary; import forestry.farming.multiblock.MultiblockLogicFarm; +import forestry.greenhouse.multiblock.MultiblockLogicGreenhouse; public class MultiblockLogicFactory implements IMultiblockLogicFactory { @@ -27,4 +29,9 @@ public class MultiblockLogicFactory implements IMultiblockLogicFactory { public IMultiblockLogicFarm createFarmLogic() { return new MultiblockLogicFarm(); } + + @Override + public IMultiblockLogicGreenhouse createGreenhouseLogic() { + return new MultiblockLogicGreenhouse(); + } } diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 44024a7b1..dbf52be8b 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -41,6 +41,7 @@ import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitSocketType; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; @@ -386,8 +387,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public EnumTemperature getTemperature() { - BlockPos coords = getReferenceCoord(); - return EnumTemperature.getFromBiome(getBiome(), coords); + return EnumTemperature.getFromValue(getExactTemperature()); } @Override @@ -398,12 +398,13 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public float getExactTemperature() { BlockPos coords = getReferenceCoord(); - return getBiome().getFloatTemperature(coords); + return ForestryAPI.climateManager.getTemperature(getWorld(), coords); } @Override public float getExactHumidity() { - return getBiome().rainfall; + BlockPos coords = getReferenceCoord(); + return ForestryAPI.climateManager.getHumidity(getWorld(), coords); } private int[] coords;