Improve greenhouse and add new greenhouse gui texture

ForestryMC · Dec 25, 2016 · d4f9c69 · d4f9c69
1 parent ea976eb
commit d4f9c69
Show file tree

Hide file tree

Showing 66 changed files with 565 additions and 394 deletions.
diff --git a/src/main/java/forestry/api/climate/EnumClimatiserModes.java b/src/main/java/forestry/api/climate/EnumClimatiserModes.java
@@ -2,6 +2,6 @@
 
 public enum EnumClimatiserModes {
 
-	POSITIVE, NEGATIVE, NONE
+	POSITIVE, NEGATIVE, BOTH
 
 }
diff --git a/src/main/java/forestry/api/climate/EnumClimatiserTypes.java b/src/main/java/forestry/api/climate/EnumClimatiserTypes.java
@@ -2,6 +2,6 @@
 
 public enum EnumClimatiserTypes {
 
-	TEMPERATURE, HUMIDITY, NONE
+	TEMPERATURE, HUMIDITY, BOTH
 
 }
diff --git a/src/main/java/forestry/api/climate/IClimateControl.java b/src/main/java/forestry/api/climate/IClimateControl.java
@@ -7,6 +7,10 @@
 
 public interface IClimateControl {
 
+	IClimateInfo getControlClimate();
+
+	void setControlClimate(IClimateInfo climateInfo);
+
 	float getControlTemperature();
 
 	float getControlHumidity();

diff --git a/src/main/java/forestry/api/climate/IClimateControlProvider.java b/src/main/java/forestry/api/climate/IClimateControlProvider.java
@@ -9,6 +9,8 @@
 
 public interface IClimateControlProvider extends ILocatable {
 
-	IClimateControl getClimateControl();
+	IClimateInfo getControlClimate();
+
+	void setControlClimate(IClimateInfo climateControl);
 
 }
diff --git a/src/main/java/forestry/api/climate/IClimateInfo.java b/src/main/java/forestry/api/climate/IClimateInfo.java
@@ -0,0 +1,9 @@
+package forestry.api.climate;
+
+public interface IClimateInfo {
+
+	float getTemperature();
+
+	float getHumidity();
+
+}
diff --git a/src/main/java/forestry/api/climate/IClimateManager.java b/src/main/java/forestry/api/climate/IClimateManager.java
@@ -14,9 +14,9 @@
 
 public interface IClimateManager {
 
-	float getTemperature(World world, BlockPos pos);
-
-	float getHumidity(World world, BlockPos pos);
+	IClimateInfo createInfo(float temperature, float humidity);
+	
+	IClimateInfo getInfo(World world, BlockPos pos);
 
 	IClimateProvider getDefaultClimate(World world, BlockPos pos);
 

diff --git a/src/main/java/forestry/api/climate/IClimatePosition.java b/src/main/java/forestry/api/climate/IClimatePosition.java
@@ -29,5 +29,7 @@ public interface IClimatePosition extends INbtReadable, INbtWritable {
 	void addHumidity(float humidity);
 
 	float getHumidity();
+
+	IClimateInfo getInfo();
 
 }
diff --git a/src/main/java/forestry/api/core/CamouflageManager.java b/src/main/java/forestry/api/core/CamouflageManager.java
@@ -9,10 +9,12 @@ public class CamouflageManager {
 
 	public static ICamouflageAccess camouflageAccess;
 
-	public static final String DEFAULT = "default";
+	public static final String BLOCK = "block";
 
 	public static final String GLASS = "glass";
 
 	public static final String DOOR = "door";
+
+	public static final String NONE = "none";
 
 }
diff --git a/src/main/java/forestry/api/core/EnumTemperature.java b/src/main/java/forestry/api/core/EnumTemperature.java
@@ -5,6 +5,7 @@
  ******************************************************************************/
 package forestry.api.core;
 
+import forestry.core.utils.ClimateUtil;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -71,7 +72,7 @@ public static EnumTemperature getFromBiome(Biome biome, World world, BlockPos po
 		if (BiomeHelper.isBiomeHellish(biome)) {
 			return HELLISH;
 		}
-		float temperature = ForestryAPI.climateManager.getTemperature(world, pos);
+		float temperature = ClimateUtil.getTemperature(world, pos);
 		return getFromValue(temperature);
 	}
 }
diff --git a/src/main/java/forestry/api/core/ICamouflageAccess.java b/src/main/java/forestry/api/core/ICamouflageAccess.java
@@ -31,7 +31,8 @@ public interface ICamouflageAccess {
 
 	boolean isItemBlackListed(String type, ItemStack camouflageBlock);
 
-	@Nullable
+	ICamouflageItemHandler getNoneItemHandler();
+
 	ICamouflageItemHandler getHandlerFromItem(ItemStack stack);
 
 }
diff --git a/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java b/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java
@@ -45,4 +45,12 @@ public String getName() {
 		return name;
 	}
 
+	@Override
+	public void onMachineAssembled() {
+	}
+
+	@Override
+	public void onMachineDisassembled() {
+	}
+
 }
diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseLogic.java b/src/main/java/forestry/api/greenhouse/IGreenhouseLogic.java
@@ -19,7 +19,11 @@ public interface IGreenhouseLogic extends INbtWritable, INbtReadable {
 	void work();
 
 	void onEvent(EnumGreenhouseEventType type, Object event);
+
+	void onMachineAssembled();
 
+	void onMachineDisassembled();
+
 	IGreenhouseController getController();
 
 	String getName();

diff --git a/src/main/java/forestry/api/greenhouse/ITerrainRecipe.java b/src/main/java/forestry/api/greenhouse/ITerrainRecipe.java
@@ -0,0 +1,16 @@
+package forestry.api.greenhouse;
+
+import forestry.api.climate.IClimateInfo;
+import net.minecraft.block.state.IBlockState;
+
+public interface ITerrainRecipe {
+
+	IBlockState getInput();
+
+	IBlockState getResult();
+
+	IClimateInfo getMinClimate();
+
+	IClimateInfo getMaxClimate();
+
+}
diff --git a/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java b/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java
@@ -5,7 +5,6 @@
  ******************************************************************************/
 package forestry.api.multiblock;
 
-import forestry.api.climate.IClimateControl;
 import forestry.api.climate.IClimateControlProvider;
 import forestry.api.climate.IClimateSourceProvider;
 import forestry.api.climate.IClimatiserDefinition;
@@ -24,8 +23,6 @@ interface Listener extends IGreenhouseComponent {
 
 	interface ClimateControl extends IGreenhouseComponent, IClimateControlProvider {
 
-		@Override
-		IClimateControl getClimateControl();
 	}
 
 	interface Door extends IGreenhouseComponent {

diff --git a/src/main/java/forestry/api/multiblock/IGreenhouseController.java b/src/main/java/forestry/api/multiblock/IGreenhouseController.java
@@ -6,13 +6,15 @@
 package forestry.api.multiblock;
 
 import java.util.List;
+import java.util.Set;
 
 import forestry.api.climate.IClimateControlProvider;
 import forestry.api.climate.IClimateRegion;
 import forestry.api.core.ICamouflageHandler;
 import forestry.api.greenhouse.EnumGreenhouseEventType;
 import forestry.api.greenhouse.IGreenhouseHousing;
 import forestry.api.greenhouse.IGreenhouseLogic;
+import forestry.api.greenhouse.IInternalBlock;
 
 public interface IGreenhouseController extends IMultiblockController, IGreenhouseHousing, ICamouflageHandler, IClimateControlProvider {
 
@@ -25,6 +27,11 @@ public interface IGreenhouseController extends IMultiblockController, IGreenhous
 	 * @return The logics of the greenhouse.
 	 */
 	List<IGreenhouseLogic> getLogics();
+
+	/**
+	 * @return All internal blocks of the greenhouse.
+	 */
+	Set<IInternalBlock> getInternalBlocks();
 
 	IClimateRegion getRegion();
 

diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java
@@ -35,6 +35,7 @@
 import forestry.core.owner.OwnerHandler;
 import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IClimatised;
+import forestry.core.utils.ClimateUtil;
 import net.minecraft.entity.item.EntityMinecart;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.datasync.DataParameter;
@@ -113,12 +114,12 @@ public EnumHumidity getHumidity() {
 
 	@Override
 	public float getExactTemperature() {
-		return ForestryAPI.climateManager.getTemperature(world, getPosition());
+		return ClimateUtil.getTemperature(world, getPosition());
 	}
 
 	@Override
 	public float getExactHumidity() {
-		return ForestryAPI.climateManager.getHumidity(world, getPosition());
+		return ClimateUtil.getHumidity(world, getPosition());
 	}
 
 	@Override

diff --git a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java
@@ -14,7 +14,6 @@
 
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
-import forestry.api.core.ForestryAPI;
 import forestry.api.core.ISpriteRegister;
 import forestry.api.core.ITextureManager;
 import forestry.api.core.Tabs;
@@ -24,6 +23,7 @@
 import forestry.apiculture.inventory.ItemInventoryHabitatLocator;
 import forestry.apiculture.render.TextureHabitatLocator;
 import forestry.core.items.ItemWithGui;
+import forestry.core.utils.ClimateUtil;
 import forestry.core.utils.Translator;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -71,9 +71,9 @@ public void addInformation(ItemStack itemstack, EntityPlayer player, List<String
 
 		Biome currentBiome = player.world.getBiome(player.getPosition());
 
-		float temperatureValue = ForestryAPI.climateManager.getTemperature(player.world, player.getPosition());
+		float temperatureValue = ClimateUtil.getTemperature(player.world, player.getPosition());
 		EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue);
-		EnumHumidity humidity = EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(player.world, player.getPosition()));
+		EnumHumidity humidity = EnumHumidity.getFromValue(ClimateUtil.getHumidity(player.world, player.getPosition()));
 
 		list.add(Translator.translateToLocal("for.gui.currentBiome") + ": " + currentBiome.getBiomeName());
 		list.add(Translator.translateToLocal("for.gui.temperature") + ": " + AlleleManager.climateHelper.toDisplay(temperature));

diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java
@@ -336,13 +336,13 @@ public Vec3d getBeeFXCoordinates() {
 	@Override
 	public float getExactTemperature() {
 		BlockPos coords = getReferenceCoord();
-		return ForestryAPI.climateManager.getTemperature(getWorldObj(), coords) + tempChange;
+		return ClimateUtil.getTemperature(getWorldObj(), coords) + tempChange;
 	}
 
 	@Override
 	public float getExactHumidity() {
 		BlockPos coords = getReferenceCoord();
-		return ForestryAPI.climateManager.getHumidity(getWorldObj(), coords) + humidChange;
+		return ClimateUtil.getHumidity(getWorldObj(), coords) + humidChange;
 	}
 
 	@Override
@@ -399,7 +399,7 @@ public boolean isRaining() {
 
 	@Override
 	public void addTemperatureChange(float change, float boundaryDown, float boundaryUp) {
-		float temperature = ForestryAPI.climateManager.getTemperature(world, getReferenceCoord());
+		float temperature = ClimateUtil.getTemperature(world, getReferenceCoord());
 
 		tempChange += change;
 		tempChange = Math.max(boundaryDown - temperature, tempChange);
@@ -408,7 +408,7 @@ public void addTemperatureChange(float change, float boundaryDown, float boundar
 
 	@Override
 	public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
-		float humidity = ForestryAPI.climateManager.getHumidity(world, getReferenceCoord());
+		float humidity = ClimateUtil.getHumidity(world, getReferenceCoord());
 
 		humidChange += change;
 		humidChange = Math.max(boundaryDown - humidity, humidChange);

diff --git a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java
@@ -101,12 +101,12 @@ public EnumHumidity getHumidity() {
 
 	@Override
 	public float getExactTemperature() {
-		return ForestryAPI.climateManager.getTemperature(world, getPos());
+		return ClimateUtil.getTemperature(world, getPos());
 	}
 
 	@Override
 	public float getExactHumidity() {
-		return ForestryAPI.climateManager.getHumidity(world, getPos());
+		return ClimateUtil.getHumidity(world, getPos());
 	}
 
 	/* UPDATING */

diff --git a/src/main/java/forestry/apiculture/tiles/TileHive.java b/src/main/java/forestry/apiculture/tiles/TileHive.java
@@ -40,6 +40,7 @@
 import forestry.core.inventory.InventoryAdapter;
 import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IActivatable;
+import forestry.core.utils.ClimateUtil;
 import forestry.core.utils.DamageSourceForestry;
 import forestry.core.utils.InventoryUtil;
 import forestry.core.utils.ItemStackUtil;
@@ -312,7 +313,7 @@ public EnumTemperature getTemperature() {
 
 	@Override
 	public EnumHumidity getHumidity() {
-		float humidity = ForestryAPI.climateManager.getHumidity(getWorld(), getPos());
+		float humidity = ClimateUtil.getHumidity(getWorld(), getPos());
 		return EnumHumidity.getFromValue(humidity);
 	}
 

diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java
@@ -25,7 +25,6 @@
 import forestry.api.arboriculture.TreeManager;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
-import forestry.api.core.ForestryAPI;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IEffectData;
@@ -44,6 +43,7 @@
 import forestry.core.network.PacketBufferForestry;
 import forestry.core.network.packets.PacketTileStream;
 import forestry.core.proxy.Proxies;
+import forestry.core.utils.ClimateUtil;
 import forestry.core.utils.ColourUtil;
 import forestry.core.utils.GeneticsUtil;
 import net.minecraft.block.state.IBlockState;
@@ -510,6 +510,6 @@ public EnumTemperature getTemperature() {
 
 	@Override
 	public EnumHumidity getHumidity() {
-		return EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(world, pos));
+		return EnumHumidity.getFromValue(ClimateUtil.getHumidity(world, pos));
 	}
 }
diff --git a/src/main/java/forestry/core/CamouflageAccess.java b/src/main/java/forestry/core/CamouflageAccess.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
+import forestry.api.core.CamouflageManager;
 import forestry.api.core.ICamouflageAccess;
 import forestry.api.core.ICamouflageItemHandler;
 import forestry.core.utils.Log;
@@ -29,6 +30,7 @@ public class CamouflageAccess implements ICamouflageAccess {
 	private static final Map<String, List<ICamouflageItemHandler>> camouflageItemHandlers = new HashMap<>();
 	private static final Map<String, List<ItemStack>> camouflageItemBlacklist = new HashMap<>();
 	private static final Map<String, List<String>> blacklistedMods = new HashMap<>();
+	public static final ICamouflageItemHandler NONE = new CamouflageHandlerNone();
 
 	@Override
 	public void registerCamouflageItemHandler(ICamouflageItemHandler itemHandler) {
@@ -48,7 +50,7 @@ public void registerCamouflageItemHandler(ICamouflageItemHandler itemHandler) {
 	@Override
 	@Nullable
 	public List<ICamouflageItemHandler> getCamouflageItemHandler(String type) {
-		if (type == null) {
+		if (type.equals(CamouflageManager.NONE)) {
 			List<ICamouflageItemHandler> handlers = new ArrayList<>();
 			for (List<ICamouflageItemHandler> handler : camouflageItemHandlers.values()) {
 				handlers.addAll(handler);
@@ -114,12 +116,16 @@ public boolean isItemBlackListed(String type, ItemStack camouflageBlock) {
 
 		return false;
 	}
+
+	@Override
+	public ICamouflageItemHandler getNoneItemHandler() {
+		return NONE;
+	}
 
 	@Override
-	@Nullable
 	public ICamouflageItemHandler getHandlerFromItem(ItemStack stack) {
 		if (stack.isEmpty()) {
-			return null;
+			return NONE;
 		}
 		for (List<ICamouflageItemHandler> handlers : camouflageItemHandlers.values()) {
 			for (ICamouflageItemHandler handler : handlers) {
@@ -128,7 +134,7 @@ public ICamouflageItemHandler getHandlerFromItem(ItemStack stack) {
 				}
 			}
 		}
-		return null;
+		return NONE;
 	}
 
 }