From d4f9c695380d70b427e64d332c436bba206ae97e Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 25 Dec 2016 02:20:44 +0100 Subject: [PATCH] Improve greenhouse and add new greenhouse gui texture --- .../api/climate/EnumClimatiserModes.java | 2 +- .../api/climate/EnumClimatiserTypes.java | 2 +- .../forestry/api/climate/IClimateControl.java | 4 + .../api/climate/IClimateControlProvider.java | 4 +- .../forestry/api/climate/IClimateInfo.java | 9 ++ .../forestry/api/climate/IClimateManager.java | 6 +- .../api/climate/IClimatePosition.java | 2 + .../forestry/api/core/CamouflageManager.java | 4 +- .../forestry/api/core/EnumTemperature.java | 3 +- .../forestry/api/core/ICamouflageAccess.java | 3 +- .../greenhouse/DefaultGreenhouseLogic.java | 8 ++ .../api/greenhouse/IGreenhouseLogic.java | 4 + .../api/greenhouse/ITerrainRecipe.java | 16 +++ .../api/multiblock/IGreenhouseComponent.java | 3 - .../api/multiblock/IGreenhouseController.java | 7 ++ .../EntityMinecartBeeHousingBase.java | 5 +- .../apiculture/items/ItemHabitatLocator.java | 6 +- .../multiblock/AlvearyController.java | 8 +- .../apiculture/tiles/TileBeeHousingBase.java | 4 +- .../forestry/apiculture/tiles/TileHive.java | 3 +- .../arboriculture/tiles/TileLeaves.java | 4 +- .../java/forestry/core/CamouflageAccess.java | 14 ++- ...fault.java => CamouflageHandlerBlock.java} | 4 +- .../forestry/core/CamouflageHandlerNone.java | 35 ++++++ .../forestry/core/DefaultClimateProvider.java | 4 +- src/main/java/forestry/core/PluginCore.java | 2 +- .../core/climate/BiomeClimateControl.java | 36 ------ .../core/climate/BiomeClimateInfo.java | 35 ++++++ .../forestry/core/climate/ClimateControl.java | 85 -------------- .../core/climate/ClimateEventHandler.java | 2 - .../forestry/core/climate/ClimateInfo.java | 63 +++++++++++ .../forestry/core/climate/ClimateManager.java | 21 ++-- .../core/climate/ClimatePosition.java | 6 + .../forestry/core/climate/ClimateRegion.java | 30 ++--- .../core/gui/GuiCamouflageSprayCan.java | 3 +- .../java/forestry/core/gui/GuiForestry.java | 5 +- .../core/gui/widgets/ProbeButton.java | 3 +- .../forestry/core/gui/widgets/Widget.java | 3 +- .../core/gui/widgets/WidgetManager.java | 6 +- .../core/items/ItemCamouflageSprayCan.java | 23 ++-- .../packets/PacketUpdateClimateControl.java | 27 ++--- .../forestry/core/utils/CamouflageUtil.java | 3 +- .../java/forestry/core/utils/ClimateUtil.java | 11 ++ .../farming/multiblock/FarmController.java | 6 +- .../greenhouse/GreenhouseClimateSource.java | 16 +-- .../greenhouse/GreenhouseClimateWindow.java | 14 +-- .../forestry/greenhouse/PluginGreenhouse.java | 13 +-- .../greenhouse/blocks/BlockGreenhouse.java | 2 +- .../greenhouse/gui/GuiGreenhouse.java | 37 +++--- .../greenhouse/gui/WidgetCamouflageTab.java | 105 ++++++++++++++++++ .../logics/GreenhouseLogicGreenhouseDoor.java | 58 ---------- .../logics/GreenhouseLogicTerrain.java | 42 +++++++ .../multiblock/DefaultClimateControl.java | 30 ----- .../multiblock/FakeGreenhouseController.java | 12 +- .../multiblock/GreenhouseController.java | 42 ++++--- .../IGreenhouseControllerInternal.java | 6 - .../greenhouse/tiles/TileGreenhouse.java | 3 +- .../tiles/TileGreenhouseClimateControl.java | 29 +++-- .../greenhouse/tiles/TileGreenhouseHatch.java | 2 +- .../tiles/TileGreenhouseWindow.java | 2 +- .../lepidopterology/genetics/Butterfly.java | 4 +- .../block/greenhouse.window_closed.json | 3 +- .../models/block/greenhouse.window_open.json | 1 + .../block/greenhouse.window_up_closed.json | 3 +- .../block/greenhouse.window_up_open.json | 1 + .../forestry/textures/gui/greenhouse.png | Bin 3897 -> 1347 bytes 66 files changed, 565 insertions(+), 394 deletions(-) create mode 100644 src/main/java/forestry/api/climate/IClimateInfo.java create mode 100644 src/main/java/forestry/api/greenhouse/ITerrainRecipe.java rename src/main/java/forestry/core/{CamouflageHandlerDefault.java => CamouflageHandlerBlock.java} (95%) create mode 100644 src/main/java/forestry/core/CamouflageHandlerNone.java delete mode 100644 src/main/java/forestry/core/climate/BiomeClimateControl.java create mode 100644 src/main/java/forestry/core/climate/BiomeClimateInfo.java delete mode 100644 src/main/java/forestry/core/climate/ClimateControl.java create mode 100644 src/main/java/forestry/core/climate/ClimateInfo.java create mode 100644 src/main/java/forestry/greenhouse/gui/WidgetCamouflageTab.java delete mode 100644 src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseDoor.java create mode 100644 src/main/java/forestry/greenhouse/logics/GreenhouseLogicTerrain.java delete mode 100644 src/main/java/forestry/greenhouse/multiblock/DefaultClimateControl.java diff --git a/src/main/java/forestry/api/climate/EnumClimatiserModes.java b/src/main/java/forestry/api/climate/EnumClimatiserModes.java index 70c9b3137..b9e64b163 100644 --- a/src/main/java/forestry/api/climate/EnumClimatiserModes.java +++ b/src/main/java/forestry/api/climate/EnumClimatiserModes.java @@ -2,6 +2,6 @@ package forestry.api.climate; 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 index f79066ebd..143d2f728 100644 --- a/src/main/java/forestry/api/climate/EnumClimatiserTypes.java +++ b/src/main/java/forestry/api/climate/EnumClimatiserTypes.java @@ -2,6 +2,6 @@ package forestry.api.climate; 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 index a49369bac..612b2ed49 100644 --- a/src/main/java/forestry/api/climate/IClimateControl.java +++ b/src/main/java/forestry/api/climate/IClimateControl.java @@ -7,6 +7,10 @@ package forestry.api.climate; 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 index c6c4d4d12..8507fc2b3 100644 --- a/src/main/java/forestry/api/climate/IClimateControlProvider.java +++ b/src/main/java/forestry/api/climate/IClimateControlProvider.java @@ -9,6 +9,8 @@ import forestry.api.core.ILocatable; 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 new file mode 100644 index 000000000..bd03fdb11 --- /dev/null +++ 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 index f4ec133c2..1bd42dfa9 100644 --- a/src/main/java/forestry/api/climate/IClimateManager.java +++ b/src/main/java/forestry/api/climate/IClimateManager.java @@ -14,9 +14,9 @@ import net.minecraft.world.World; 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 index 766b9d616..15eeb8e33 100644 --- 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 index 87cdcbdc8..9fd64ac31 100644 --- 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 index 6dc68cc0f..d772986c9 100644 --- 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 enum EnumTemperature { 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 index 25a038d2e..478593fb8 100644 --- 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 index 112023715..b90b25b56 100644 --- a/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java +++ b/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java @@ -45,4 +45,12 @@ public class DefaultGreenhouseLogic implements IGreenhouseLogic { 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 index 1f0478994..aa302abd2 100644 --- 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 new file mode 100644 index 000000000..4f7a06389 --- /dev/null +++ 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 index 7025ce7e0..32ce3d287 100644 --- 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 @@ public interface IGreenhouseComponent exte 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 index 63de39232..ac96cb70c 100644 --- a/src/main/java/forestry/api/multiblock/IGreenhouseController.java +++ b/src/main/java/forestry/api/multiblock/IGreenhouseController.java @@ -6,6 +6,7 @@ package forestry.api.multiblock; import java.util.List; +import java.util.Set; import forestry.api.climate.IClimateControlProvider; import forestry.api.climate.IClimateRegion; @@ -13,6 +14,7 @@ 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 getLogics(); + + /** + * @return All internal blocks of the greenhouse. + */ + Set getInternalBlocks(); IClimateRegion getRegion(); diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java index 76899cf2e..ae844f10e 100644 --- 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.IOwnerHandler; 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 abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain @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 index 6f084c671..2402b3fca 100644 --- a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java +++ b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java @@ -14,7 +14,6 @@ import java.util.List; 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.gui.GuiHabitatLocator; 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 class ItemHabitatLocator extends ItemWithGui implements ISpriteRegister { 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 index 539cec0c0..00c7de18c 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -336,13 +336,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @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 class AlvearyController extends RectangularMultiblockControllerBase imple @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 class AlvearyController extends RectangularMultiblockControllerBase imple @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 index 5408e7cfc..f8737f035 100644 --- a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java @@ -101,12 +101,12 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing @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 index fbd4cefe9..61fce8130 100644 --- 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.config.Config; 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 class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv @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 index 514448d84..7c1ff131a 100644 --- 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.ITreekeepingMode; 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.arboriculture.network.PacketRipeningUpdate; 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 class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @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 index d398ec484..ea7ea04a9 100644 --- a/src/main/java/forestry/core/CamouflageAccess.java +++ b/src/main/java/forestry/core/CamouflageAccess.java @@ -16,6 +16,7 @@ import java.util.HashMap; 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> camouflageItemHandlers = new HashMap<>(); private static final Map> camouflageItemBlacklist = new HashMap<>(); private static final Map> blacklistedMods = new HashMap<>(); + public static final ICamouflageItemHandler NONE = new CamouflageHandlerNone(); @Override public void registerCamouflageItemHandler(ICamouflageItemHandler itemHandler) { @@ -48,7 +50,7 @@ public class CamouflageAccess implements ICamouflageAccess { @Override @Nullable public List getCamouflageItemHandler(String type) { - if (type == null) { + if (type.equals(CamouflageManager.NONE)) { List handlers = new ArrayList<>(); for (List handler : camouflageItemHandlers.values()) { handlers.addAll(handler); @@ -114,12 +116,16 @@ public class CamouflageAccess implements ICamouflageAccess { return false; } + + @Override + public ICamouflageItemHandler getNoneItemHandler() { + return NONE; + } @Override - @Nullable public ICamouflageItemHandler getHandlerFromItem(ItemStack stack) { if (stack.isEmpty()) { - return null; + return NONE; } for (List handlers : camouflageItemHandlers.values()) { for (ICamouflageItemHandler handler : handlers) { @@ -128,7 +134,7 @@ public class CamouflageAccess implements ICamouflageAccess { } } } - return null; + return NONE; } } diff --git a/src/main/java/forestry/core/CamouflageHandlerDefault.java b/src/main/java/forestry/core/CamouflageHandlerBlock.java similarity index 95% rename from src/main/java/forestry/core/CamouflageHandlerDefault.java rename to src/main/java/forestry/core/CamouflageHandlerBlock.java index 07d9bd411..bdd864045 100644 --- a/src/main/java/forestry/core/CamouflageHandlerDefault.java +++ b/src/main/java/forestry/core/CamouflageHandlerBlock.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.tuple.Pair; -public class CamouflageHandlerDefault implements ICamouflageItemHandler { +public class CamouflageHandlerBlock implements ICamouflageItemHandler { @Override public boolean canHandle(ItemStack stack) { @@ -42,7 +42,7 @@ public class CamouflageHandlerDefault implements ICamouflageItemHandler { @Override public String getType() { - return CamouflageManager.DEFAULT; + return CamouflageManager.BLOCK; } @Override diff --git a/src/main/java/forestry/core/CamouflageHandlerNone.java b/src/main/java/forestry/core/CamouflageHandlerNone.java new file mode 100644 index 000000000..e3fe06ca7 --- /dev/null +++ b/src/main/java/forestry/core/CamouflageHandlerNone.java @@ -0,0 +1,35 @@ +package forestry.core; + +import org.apache.commons.lang3.tuple.Pair; + +import forestry.api.core.CamouflageManager; +import forestry.api.core.ICamouflageHandler; +import forestry.api.core.ICamouflageItemHandler; +import forestry.api.core.ICamouflagedTile; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.item.ItemStack; + +public class CamouflageHandlerNone implements ICamouflageItemHandler { + + @Override + public boolean canHandle(ItemStack stack) { + return true; + } + + @Override + public String getType() { + return CamouflageManager.NONE; + } + + @Override + public float getLightTransmittance(ItemStack stack, ICamouflageHandler camouflageHandler) { + return 0; + } + + @Override + public Pair getModel(ItemStack stack, ICamouflageHandler camouflageHandler, ICamouflagedTile camouflageTile) { + return Pair.of(null, null); + } + +} diff --git a/src/main/java/forestry/core/DefaultClimateProvider.java b/src/main/java/forestry/core/DefaultClimateProvider.java index 731ffa6bc..58a8a61fa 100644 --- a/src/main/java/forestry/core/DefaultClimateProvider.java +++ b/src/main/java/forestry/core/DefaultClimateProvider.java @@ -13,7 +13,7 @@ package forestry.core; import forestry.api.climate.IClimateProvider; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.core.ForestryAPI; +import forestry.core.utils.ClimateUtil; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -39,6 +39,6 @@ public class DefaultClimateProvider implements IClimateProvider { @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/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index a9cce4eb4..14fdabc3e 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -131,7 +131,7 @@ public class PluginCore extends BlankForestryPlugin { rootCommand.addChildCommand(new CommandPlugins()); - CamouflageManager.camouflageAccess.registerCamouflageItemHandler(new CamouflageHandlerDefault()); + CamouflageManager.camouflageAccess.registerCamouflageItemHandler(new CamouflageHandlerBlock()); CamouflageManager.camouflageAccess.registerCamouflageItemHandler(new CamouflageHandlerGlass()); CamouflageManager.camouflageAccess.registerCamouflageItemHandler(new CamouflageHandlerDoor()); } diff --git a/src/main/java/forestry/core/climate/BiomeClimateControl.java b/src/main/java/forestry/core/climate/BiomeClimateControl.java deleted file mode 100644 index c97bc9564..000000000 --- a/src/main/java/forestry/core/climate/BiomeClimateControl.java +++ /dev/null @@ -1,36 +0,0 @@ -package forestry.core.climate; - -import java.util.HashMap; -import java.util.Map; - -import forestry.greenhouse.multiblock.DefaultClimateControl; -import net.minecraft.world.biome.Biome; - -public class BiomeClimateControl extends DefaultClimateControl { - - private static final Map climateControls = new HashMap<>(); - - public static BiomeClimateControl getControl(Biome biome) { - if (!climateControls.containsKey(biome)) { - climateControls.put(biome, new BiomeClimateControl(biome)); - } - return climateControls.get(biome); - } - - private final Biome biome; - - private BiomeClimateControl(Biome biome) { - this.biome = biome; - } - - @Override - public float getControlTemperature() { - return biome.getTemperature(); - } - - @Override - public float getControlHumidity() { - return biome.getRainfall(); - } - -} diff --git a/src/main/java/forestry/core/climate/BiomeClimateInfo.java b/src/main/java/forestry/core/climate/BiomeClimateInfo.java new file mode 100644 index 000000000..17402f53e --- /dev/null +++ b/src/main/java/forestry/core/climate/BiomeClimateInfo.java @@ -0,0 +1,35 @@ +package forestry.core.climate; + +import java.util.HashMap; +import java.util.Map; + +import forestry.api.climate.IClimateInfo; +import net.minecraft.world.biome.Biome; + +public class BiomeClimateInfo implements IClimateInfo { + + private static final Map climateControls = new HashMap<>(); + + public static BiomeClimateInfo getInfo(Biome biome) { + if (!climateControls.containsKey(biome)) { + climateControls.put(biome, new BiomeClimateInfo(biome)); + } + return climateControls.get(biome); + } + + private final Biome biome; + + private BiomeClimateInfo(Biome biome) { + this.biome = biome; + } + + @Override + public float getTemperature() { + return biome.getTemperature(); + } + + @Override + public float getHumidity() { + return biome.getRainfall(); + } +} diff --git a/src/main/java/forestry/core/climate/ClimateControl.java b/src/main/java/forestry/core/climate/ClimateControl.java deleted file mode 100644 index b153c5430..000000000 --- a/src/main/java/forestry/core/climate/ClimateControl.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * 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.climate; - -import java.io.IOException; - -import forestry.api.climate.IClimateControl; -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; -import forestry.core.network.IStreamable; -import forestry.core.network.PacketBufferForestry; -import net.minecraft.nbt.NBTTagCompound; - -public class ClimateControl implements IClimateControl, INbtWritable, INbtReadable, IStreamable { - - private float temperature; - private float humidity; - - public ClimateControl() { - temperature = 2.0F; - humidity = 2.0F; - } - - @Override - public float getControlTemperature() { - return temperature; - } - - @Override - public float getControlHumidity() { - return humidity; - } - - @Override - public void setControlTemperature(float temperature) { - if (temperature > 2.0F) { - this.temperature = 2.0F; - } else { - this.temperature = temperature; - } - } - - @Override - public void setControlHumidity(float humidity) { - if (humidity > 2.0F) { - this.humidity = 2.0F; - } else { - this.humidity = humidity; - } - } - - @Override - public void writeData(PacketBufferForestry data) { - data.writeFloat(temperature); - data.writeFloat(humidity); - } - - @Override - public void readData(PacketBufferForestry data) throws IOException { - temperature = data.readFloat(); - humidity = data.readFloat(); - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - temperature = nbt.getFloat("Temperature"); - humidity = nbt.getFloat("Humidity"); - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - nbt.setFloat("Temperature", temperature); - nbt.setFloat("Humidity", humidity); - return nbt; - } - -} diff --git a/src/main/java/forestry/core/climate/ClimateEventHandler.java b/src/main/java/forestry/core/climate/ClimateEventHandler.java index 0a915b018..8edc51b6c 100644 --- a/src/main/java/forestry/core/climate/ClimateEventHandler.java +++ b/src/main/java/forestry/core/climate/ClimateEventHandler.java @@ -16,11 +16,9 @@ import java.util.Map; import forestry.api.climate.IClimateRegion; import forestry.api.core.ForestryAPI; -import forestry.core.multiblock.MultiblockRegistry; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; diff --git a/src/main/java/forestry/core/climate/ClimateInfo.java b/src/main/java/forestry/core/climate/ClimateInfo.java new file mode 100644 index 000000000..53be66e72 --- /dev/null +++ b/src/main/java/forestry/core/climate/ClimateInfo.java @@ -0,0 +1,63 @@ +package forestry.core.climate; + +import java.io.IOException; +import forestry.api.climate.IClimateInfo; +import forestry.core.network.PacketBufferForestry; +import net.minecraft.nbt.NBTTagCompound; + +public class ClimateInfo implements IClimateInfo{ + + public static final ClimateInfo MIN = new ClimateInfo(false); + public static final ClimateInfo MAX = new ClimateInfo(true); + + private final float temperature; + private final float humidity; + + private ClimateInfo(boolean isMax) { + if(isMax){ + this.temperature = 2.0F; + this.humidity = 2.0F; + }else{ + this.temperature = 0.0F; + this.humidity = 0.0F; + } + } + + public ClimateInfo(float temperature, float humidity) { + if (temperature > MAX.getTemperature()) { + temperature = MAX.getTemperature(); + } + if (humidity > MAX.getHumidity()) { + humidity = MAX.getHumidity(); + } + if (temperature < MIN.getTemperature()) { + temperature = MIN.getTemperature(); + } + if (humidity < MIN.getHumidity()) { + humidity = MIN.getHumidity(); + } + this.temperature = temperature; + this.humidity = humidity; + } + + public ClimateInfo(NBTTagCompound compound) { + this.temperature = compound.getFloat("Temperature"); + this.humidity = compound.getFloat("Humidity"); + } + + public ClimateInfo(PacketBufferForestry data) throws IOException { + this.temperature = data.readFloat(); + this.humidity = data.readFloat(); + } + + @Override + public float getTemperature() { + return temperature; + } + + @Override + public float getHumidity() { + return humidity; + } + +} diff --git a/src/main/java/forestry/core/climate/ClimateManager.java b/src/main/java/forestry/core/climate/ClimateManager.java index 6851a0b5c..625b0984f 100644 --- a/src/main/java/forestry/core/climate/ClimateManager.java +++ b/src/main/java/forestry/core/climate/ClimateManager.java @@ -14,6 +14,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import forestry.api.climate.IClimateInfo; import forestry.api.climate.IClimateManager; import forestry.api.climate.IClimatePosition; import forestry.api.climate.IClimateProvider; @@ -98,25 +100,20 @@ public class ClimateManager implements IClimateManager { } } } - + @Override - public float getTemperature(World world, BlockPos pos) { - IClimatePosition position = ForestryAPI.climateManager.getPosition(world, pos); - - if (position != null) { - return position.getTemperature(); - } - return world.getBiome(pos).getTemperature(); + public IClimateInfo createInfo(float temperature, float humidity) { + return new ClimateInfo(temperature, humidity); } - + @Override - public float getHumidity(World world, BlockPos pos) { + public IClimateInfo getInfo(World world, BlockPos pos) { IClimatePosition position = ForestryAPI.climateManager.getPosition(world, pos); if (position != null) { - return position.getHumidity(); + return position.getInfo(); } - return world.getBiome(pos).getRainfall(); + return BiomeClimateInfo.getInfo(world.getBiome(pos)); } @Override diff --git a/src/main/java/forestry/core/climate/ClimatePosition.java b/src/main/java/forestry/core/climate/ClimatePosition.java index 19404bbeb..d095bd7ae 100644 --- a/src/main/java/forestry/core/climate/ClimatePosition.java +++ b/src/main/java/forestry/core/climate/ClimatePosition.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.climate; +import forestry.api.climate.IClimateInfo; import forestry.api.climate.IClimatePosition; import forestry.api.climate.IClimateRegion; import net.minecraft.nbt.NBTTagCompound; @@ -83,6 +84,11 @@ public class ClimatePosition implements IClimatePosition { public float getHumidity() { return humidity; } + + @Override + public IClimateInfo getInfo() { + return new ClimateInfo(temperature, humidity); + } @Override public void readFromNBT(NBTTagCompound nbt) { diff --git a/src/main/java/forestry/core/climate/ClimateRegion.java b/src/main/java/forestry/core/climate/ClimateRegion.java index 3cf68a618..2f6bff3ec 100644 --- a/src/main/java/forestry/core/climate/ClimateRegion.java +++ b/src/main/java/forestry/core/climate/ClimateRegion.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import forestry.api.climate.IClimateControl; +import forestry.api.climate.IClimateInfo; import forestry.api.climate.IClimatePosition; import forestry.api.climate.IClimateRegion; import forestry.api.climate.IClimateSource; @@ -99,23 +99,23 @@ public class ClimateRegion implements IClimateRegion, IStreamable { if (world.isBlockLoaded(pos)) { hasChange |= updateSides(position); if (!controller.isAssembled()) { - IClimateControl climateControl = getControl(pos); + IClimateInfo climateInfo = getControl(pos); - if (position.getTemperature() != climateControl.getControlTemperature()) { - if (position.getTemperature() > climateControl.getControlTemperature()) { - position.addTemperature(-Math.min(0.01F, position.getTemperature() - climateControl.getControlTemperature())); + if (position.getTemperature() != climateInfo.getTemperature()) { + if (position.getTemperature() > climateInfo.getTemperature()) { + position.addTemperature(-Math.min(0.01F, position.getTemperature() - climateInfo.getTemperature())); hasChange = true; } else { - position.addTemperature(Math.min(0.01F, climateControl.getControlTemperature() - position.getTemperature())); + position.addTemperature(Math.min(0.01F, climateInfo.getTemperature() - position.getTemperature())); hasChange = true; } } - if (position.getHumidity() != climateControl.getControlHumidity()) { - if (position.getHumidity() > climateControl.getControlHumidity()) { - position.addHumidity(-Math.min(0.01F, position.getHumidity() - climateControl.getControlHumidity())); + if (position.getHumidity() != climateInfo.getHumidity()) { + if (position.getHumidity() > climateInfo.getHumidity()) { + position.addHumidity(-Math.min(0.01F, position.getHumidity() - climateInfo.getHumidity())); hasChange = true; } else { - position.addHumidity(Math.min(0.01F, climateControl.getControlHumidity() - position.getHumidity())); + position.addHumidity(Math.min(0.01F, climateInfo.getHumidity() - position.getHumidity())); hasChange = true; } } @@ -130,9 +130,9 @@ public class ClimateRegion implements IClimateRegion, IStreamable { protected boolean updateSides(IClimatePosition positon) { BlockPos pos = positon.getPos(); - IClimateControl climateControl = getControl(pos); + IClimateInfo climateInfo = getControl(pos); boolean hasChange = false; - if (climateControl.getControlTemperature() != temperature || climateControl.getControlHumidity() != humidity) { + if (climateInfo.getTemperature() != temperature || climateInfo.getHumidity() != humidity) { for (EnumFacing facing : EnumFacing.VALUES) { IClimatePosition climatedInfoFace = getPosition(pos.offset(facing)); if (climatedInfoFace != null) { @@ -154,13 +154,13 @@ public class ClimateRegion implements IClimateRegion, IStreamable { return hasChange; } - protected IClimateControl getControl(BlockPos pos) { + protected IClimateInfo getControl(BlockPos pos) { if (world.isBlockLoaded(pos)) { if (!controller.isAssembled()) { - return BiomeClimateControl.getControl(world.getBiome(pos)); + return BiomeClimateInfo.getInfo(world.getBiome(pos)); } } - return controller.getClimateControl(); + return controller.getControlClimate(); } @Override diff --git a/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java b/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java index 2aabbf2b0..9bfe6d9b1 100644 --- a/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java +++ b/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java @@ -1,5 +1,6 @@ package forestry.core.gui; +import forestry.api.core.CamouflageManager; import forestry.core.config.Constants; import forestry.core.gui.widgets.WidgetCamouflageSlot; import forestry.core.inventory.ItemInventoryCamouflageSprayCan; @@ -12,7 +13,7 @@ public class GuiCamouflageSprayCan extends GuiForestry ext @Override protected void mouseReleased(int mouseX, int mouseY, int state) { + if(widgetManager.handleMouseRelease(mouseX, mouseY, state)){ + return; + } super.mouseReleased(mouseX, mouseY, state); - - widgetManager.handleMouseRelease(mouseX, mouseY, state); } @Override diff --git a/src/main/java/forestry/core/gui/widgets/ProbeButton.java b/src/main/java/forestry/core/gui/widgets/ProbeButton.java index 2b0a83cfb..f0cdcd0d3 100644 --- a/src/main/java/forestry/core/gui/widgets/ProbeButton.java +++ b/src/main/java/forestry/core/gui/widgets/ProbeButton.java @@ -51,10 +51,11 @@ public class ProbeButton extends Widget { } @Override - public void handleMouseRelease(int mouseX, int mouseY, int eventType) { + public boolean handleMouseRelease(int mouseX, int mouseY, int eventType) { if (pressed) { pressed = false; } + return false; } @Override diff --git a/src/main/java/forestry/core/gui/widgets/Widget.java b/src/main/java/forestry/core/gui/widgets/Widget.java index c10722934..4ab8091ae 100755 --- a/src/main/java/forestry/core/gui/widgets/Widget.java +++ b/src/main/java/forestry/core/gui/widgets/Widget.java @@ -61,7 +61,8 @@ public abstract class Widget implements IToolTipProvider { public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { } - public void handleMouseRelease(int mouseX, int mouseY, int eventType) { + public boolean handleMouseRelease(int mouseX, int mouseY, int eventType) { + return false; } public void handleMouseMove(int mouseX, int mouseY, int mouseButton, long time) { diff --git a/src/main/java/forestry/core/gui/widgets/WidgetManager.java b/src/main/java/forestry/core/gui/widgets/WidgetManager.java index 75061a594..3a72525c2 100644 --- a/src/main/java/forestry/core/gui/widgets/WidgetManager.java +++ b/src/main/java/forestry/core/gui/widgets/WidgetManager.java @@ -69,10 +69,12 @@ public class WidgetManager { } } - public void handleMouseRelease(int mouseX, int mouseY, int eventType) { + public boolean handleMouseRelease(int mouseX, int mouseY, int eventType) { + boolean hasToStop = false; for (Widget slot : widgets) { - slot.handleMouseRelease(mouseX, mouseY, eventType); + hasToStop|=slot.handleMouseRelease(mouseX, mouseY, eventType); } + return hasToStop; } public void handleMouseMove(int mouseX, int mouseY, int mouseButton, long time) { diff --git a/src/main/java/forestry/core/items/ItemCamouflageSprayCan.java b/src/main/java/forestry/core/items/ItemCamouflageSprayCan.java index a6f9213d7..96e5cc6a9 100644 --- a/src/main/java/forestry/core/items/ItemCamouflageSprayCan.java +++ b/src/main/java/forestry/core/items/ItemCamouflageSprayCan.java @@ -36,23 +36,22 @@ public class ItemCamouflageSprayCan extends ItemWithGui { super.registerModel(item, manager); ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:camouflage_spray_can_filled")); } - + @Override - public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { + public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, + float hitY, float hitZ, EnumHand hand) { ItemStack heldItem = player.getHeldItem(hand); ItemInventoryCamouflageSprayCan inventory = new ItemInventoryCamouflageSprayCan(player, heldItem); ItemStack camouflage = inventory.getStackInSlot(0); - if (!camouflage.isEmpty()) { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof ICamouflageHandler) { - ICamouflageHandler handler = (ICamouflageHandler) tile; - String type = CamouflageManager.camouflageAccess.getHandlerFromItem(camouflage).getType(); - if (handler.canHandleType(type)) { - if (world.isRemote) { - handler.setCamouflageBlock(type, camouflage, false); - } - return EnumActionResult.SUCCESS; + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof ICamouflageHandler) { + ICamouflageHandler handler = (ICamouflageHandler) tile; + String type = CamouflageManager.camouflageAccess.getHandlerFromItem(camouflage).getType(); + if (handler.canHandleType(type)) { + if(world.isRemote){ + handler.setCamouflageBlock(type, camouflage, true); } + return EnumActionResult.SUCCESS; } } return EnumActionResult.PASS; diff --git a/src/main/java/forestry/core/network/packets/PacketUpdateClimateControl.java b/src/main/java/forestry/core/network/packets/PacketUpdateClimateControl.java index 32f194723..994aef12f 100644 --- a/src/main/java/forestry/core/network/packets/PacketUpdateClimateControl.java +++ b/src/main/java/forestry/core/network/packets/PacketUpdateClimateControl.java @@ -2,10 +2,11 @@ package forestry.core.network.packets; import java.io.IOException; -import forestry.api.climate.IClimateControl; import forestry.api.climate.IClimateControlProvider; +import forestry.api.climate.IClimateInfo; import forestry.api.multiblock.IMultiblockComponent; import forestry.api.multiblock.IMultiblockLogic; +import forestry.core.climate.ClimateInfo; import forestry.core.network.ForestryPacket; import forestry.core.network.IForestryPacketHandlerServer; import forestry.core.network.IForestryPacketServer; @@ -17,15 +18,12 @@ import net.minecraft.util.math.BlockPos; public class PacketUpdateClimateControl extends ForestryPacket implements IForestryPacketServer { private final BlockPos pos; - private final float controlTemperature; - private final float controlHumidity; + private final IClimateInfo climateInfo; public PacketUpdateClimateControl(IClimateControlProvider provider) { pos = provider.getCoordinates(); - IClimateControl control = provider.getClimateControl(); - controlTemperature = control.getControlTemperature(); - controlHumidity = control.getControlHumidity(); + climateInfo = provider.getControlClimate(); } @Override @@ -36,32 +34,31 @@ public class PacketUpdateClimateControl extends ForestryPacket implements IFores @Override protected void writeData(PacketBufferForestry data) throws IOException { data.writeBlockPos(pos); - data.writeFloat(controlTemperature); - data.writeFloat(controlHumidity); + data.writeFloat(climateInfo.getTemperature()); + data.writeFloat(climateInfo.getHumidity()); } public static class Handler implements IForestryPacketHandlerServer { @Override public void onPacketData(PacketBufferForestry data, EntityPlayerMP player) throws IOException { BlockPos pos = data.readBlockPos(); - float controlTemperature = data.readFloat(); - float controlHumidity = data.readFloat(); + float tmperature = data.readFloat(); + float humidity = data.readFloat(); TileEntity tile = player.world.getTileEntity(pos); - IClimateControl control = null; + IClimateControlProvider control = null; if (tile instanceof IMultiblockComponent) { IMultiblockComponent component = (IMultiblockComponent) tile; IMultiblockLogic logic = component.getMultiblockLogic(); if (logic.isConnected() && logic.getController() instanceof IClimateControlProvider) { - control = ((IClimateControlProvider) logic.getController()).getClimateControl(); + control = (IClimateControlProvider) logic.getController(); } } else if (tile instanceof IClimateControlProvider) { - control = ((IClimateControlProvider) tile).getClimateControl(); + control = (IClimateControlProvider) tile; } if (control != null) { - control.setControlTemperature(controlTemperature); - control.setControlHumidity(controlHumidity); + control.setControlClimate(new ClimateInfo(tmperature, humidity)); } } } diff --git a/src/main/java/forestry/core/utils/CamouflageUtil.java b/src/main/java/forestry/core/utils/CamouflageUtil.java index 79ef99791..f697e36b8 100644 --- a/src/main/java/forestry/core/utils/CamouflageUtil.java +++ b/src/main/java/forestry/core/utils/CamouflageUtil.java @@ -90,7 +90,8 @@ public class CamouflageUtil { if (tile instanceof ICamouflageHandler) { ICamouflageHandler tileHandler = (ICamouflageHandler) tile; camouflageStack = tileHandler.getCamouflageBlock(type); - } else if (tile instanceof IMultiblockComponent) { + } + if (camouflageStack.isEmpty() && tile instanceof IMultiblockComponent) { IMultiblockComponent component = (IMultiblockComponent) tile; IMultiblockController controller = component.getMultiblockLogic().getController(); if (controller.isAssembled() && controller instanceof ICamouflageHandler) { diff --git a/src/main/java/forestry/core/utils/ClimateUtil.java b/src/main/java/forestry/core/utils/ClimateUtil.java index 8eaaa28d2..9e25ba8a0 100644 --- a/src/main/java/forestry/core/utils/ClimateUtil.java +++ b/src/main/java/forestry/core/utils/ClimateUtil.java @@ -16,10 +16,13 @@ import java.util.Locale; import forestry.api.climate.IClimatePosition; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IClimateHelper; import forestry.core.climate.ClimateRegion; import forestry.core.network.PacketBufferForestry; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class ClimateUtil implements IClimateHelper { @@ -203,6 +206,14 @@ public class ClimateUtil implements IClimateHelper { public String toDisplay(EnumHumidity humidity) { return Translator.translateToLocal("for.gui." + humidity.toString().toLowerCase(Locale.ENGLISH)); } + + public static float getTemperature(World world, BlockPos pos){ + return ForestryAPI.climateManager.getInfo(world, pos).getTemperature(); + } + + public static float getHumidity(World world, BlockPos pos){ + return ForestryAPI.climateManager.getInfo(world, pos).getHumidity(); + } public static void writeRoomPositionData(IClimatePosition position, PacketBufferForestry data) { data.writeBlockPos(position.getPos()); diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index cb77e2332..04bf55cc6 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -34,7 +34,6 @@ 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; @@ -59,6 +58,7 @@ import forestry.core.multiblock.MultiblockValidationException; import forestry.core.multiblock.RectangularMultiblockControllerBase; import forestry.core.network.PacketBufferForestry; import forestry.core.tiles.ILiquidTankTile; +import forestry.core.utils.ClimateUtil; import forestry.core.utils.PlayerUtil; import forestry.core.utils.TopDownBlockPosComparator; import forestry.core.utils.Translator; @@ -387,13 +387,13 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public float getExactTemperature() { BlockPos coords = getCoordinates(); - return ForestryAPI.climateManager.getTemperature(getWorldObj(), coords); + return ClimateUtil.getTemperature(getWorldObj(), coords); } @Override public float getExactHumidity() { BlockPos coords = getCoordinates(); - return ForestryAPI.climateManager.getHumidity(getWorldObj(), coords); + return ClimateUtil.getHumidity(getWorldObj(), coords); } @Override diff --git a/src/main/java/forestry/greenhouse/GreenhouseClimateSource.java b/src/main/java/forestry/greenhouse/GreenhouseClimateSource.java index 26a8fb9fe..e54dbb28a 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseClimateSource.java +++ b/src/main/java/forestry/greenhouse/GreenhouseClimateSource.java @@ -12,7 +12,7 @@ package forestry.greenhouse; import forestry.api.climate.EnumClimatiserModes; import forestry.api.climate.EnumClimatiserTypes; -import forestry.api.climate.IClimateControl; +import forestry.api.climate.IClimateInfo; import forestry.api.climate.IClimatePosition; import forestry.api.climate.IClimateRegion; import forestry.api.climate.IClimatiserDefinition; @@ -50,9 +50,9 @@ public class GreenhouseClimateSource

extends boolean isActive = false; if (logic.isConnected() && controller.isAssembled() && controller instanceof IGreenhouseControllerInternal && positionsInRange.iterator().hasNext()) { IGreenhouseControllerInternal greenhouseInternal = (IGreenhouseControllerInternal) controller; - IClimateControl climateControl = getClimateControl(greenhouseInternal); - float controlTemp = climateControl.getControlTemperature(); - float controlHum = climateControl.getControlHumidity(); + IClimateInfo climateInfo = getClimateControl(greenhouseInternal); + float controlTemp = climateInfo.getTemperature(); + float controlHum = climateInfo.getHumidity(); isActive = greenhouseInternal.canWork() && provider.canWork(); EnumClimatiserTypes type = definition.getType(); EnumClimatiserModes mode = definition.getMode(); @@ -135,15 +135,15 @@ public class GreenhouseClimateSource

extends } protected boolean canChange(EnumClimatiserTypes climatiserType, EnumClimatiserTypes type) { - return type == climatiserType || climatiserType == EnumClimatiserTypes.NONE; + return type == climatiserType || climatiserType == EnumClimatiserTypes.BOTH; } protected boolean canChange(EnumClimatiserModes climatiserMode, EnumClimatiserModes mode) { - return mode == climatiserMode || climatiserMode == EnumClimatiserModes.NONE; + return mode == climatiserMode || climatiserMode == EnumClimatiserModes.BOTH; } - protected IClimateControl getClimateControl(IGreenhouseControllerInternal greenhouseInternal) { - return greenhouseInternal.getClimateControl(); + protected IClimateInfo getClimateControl(IGreenhouseControllerInternal greenhouseInternal) { + return greenhouseInternal.getControlClimate(); } } diff --git a/src/main/java/forestry/greenhouse/GreenhouseClimateWindow.java b/src/main/java/forestry/greenhouse/GreenhouseClimateWindow.java index d447560e2..dcb2117c5 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseClimateWindow.java +++ b/src/main/java/forestry/greenhouse/GreenhouseClimateWindow.java @@ -4,13 +4,13 @@ import javax.annotation.Nullable; import forestry.api.climate.EnumClimatiserModes; import forestry.api.climate.EnumClimatiserTypes; -import forestry.api.climate.IClimateControl; +import forestry.api.climate.IClimateInfo; import forestry.api.climate.IClimatePosition; import forestry.api.climate.IClimateRegion; import forestry.api.climate.IClimatiserDefinition; import forestry.api.multiblock.IMultiblockController; import forestry.api.multiblock.IMultiblockLogic; -import forestry.core.climate.BiomeClimateControl; +import forestry.core.climate.BiomeClimateInfo; import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; import forestry.greenhouse.tiles.TileGreenhouseWindow; import forestry.greenhouse.tiles.TileGreenhouseWindow.WindowMode; @@ -41,9 +41,9 @@ public class GreenhouseClimateWindow extends GreenhouseClimateSource 20) { - int openDoors = 0; - for (IMultiblockComponent component : controller.getComponents()) { - if (component instanceof TileGreenhouseDoor) { - IBlockState state = ((TileGreenhouseDoor) component).getWorld().getBlockState(component.getCoordinates()); - if (state.getValue(BlockDoor.OPEN)) { - openDoors++; - } - } - } - controller.addTemperatureChange(-0.0001F * openDoors, 0.05F, 2.5F); - controller.addHumidityChange(-0.0001F * openDoors, 0.05F, 2.5F); - workTimer = 0; - }*/ - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - nbt.setInteger("workTimer", workTimer); - return nbt; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - workTimer = nbt.getInteger("workTimer"); - } - -} diff --git a/src/main/java/forestry/greenhouse/logics/GreenhouseLogicTerrain.java b/src/main/java/forestry/greenhouse/logics/GreenhouseLogicTerrain.java new file mode 100644 index 000000000..69f5bfbdf --- /dev/null +++ b/src/main/java/forestry/greenhouse/logics/GreenhouseLogicTerrain.java @@ -0,0 +1,42 @@ +package forestry.greenhouse.logics; + +import java.util.HashSet; +import java.util.Set; + +import forestry.api.greenhouse.DefaultGreenhouseLogic; +import forestry.api.greenhouse.IInternalBlock; +import forestry.api.multiblock.IGreenhouseController; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class GreenhouseLogicTerrain extends DefaultGreenhouseLogic { + + private World world; + private Set terrain; + + public GreenhouseLogicTerrain(IGreenhouseController controller) { + super(controller, "Terrain"); + this.terrain = new HashSet<>(); + this.world = controller.getWorldObj(); + } + + @Override + public void work() { + if (controller == null || !controller.isAssembled()) { + return; + } + } + + @Override + public void onMachineAssembled() { + for(IInternalBlock internalBlock : controller.getInternalBlocks()){ + BlockPos pos = internalBlock.getPos(); + } + } + + @Override + public void onMachineDisassembled() { + terrain.clear(); + } + +} diff --git a/src/main/java/forestry/greenhouse/multiblock/DefaultClimateControl.java b/src/main/java/forestry/greenhouse/multiblock/DefaultClimateControl.java deleted file mode 100644 index 55cc994b1..000000000 --- a/src/main/java/forestry/greenhouse/multiblock/DefaultClimateControl.java +++ /dev/null @@ -1,30 +0,0 @@ -package forestry.greenhouse.multiblock; - -import forestry.api.climate.IClimateControl; - -public class DefaultClimateControl implements IClimateControl { - - public static final DefaultClimateControl instance = new DefaultClimateControl(); - - public DefaultClimateControl() { - } - - @Override - public float getControlTemperature() { - return 2.0F; - } - - @Override - public float getControlHumidity() { - return 2.0F; - } - - @Override - public void setControlTemperature(float temperature) { - } - - @Override - public void setControlHumidity(float humidity) { - } - -} diff --git a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java index 9e7be49e9..c7a48179d 100644 --- a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java @@ -15,13 +15,14 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import forestry.api.climate.IClimateControl; +import forestry.api.climate.IClimateInfo; import forestry.api.climate.IClimateRegion; import forestry.api.greenhouse.EnumGreenhouseEventType; import forestry.api.greenhouse.IGreenhouseLogic; import forestry.api.greenhouse.IInternalBlock; import forestry.api.multiblock.IGreenhouseComponent.ButterflyHatch; import forestry.api.multiblock.IGreenhouseComponent.Listener; +import forestry.core.climate.ClimateInfo; import forestry.core.fluids.FakeTankManager; import forestry.core.fluids.ITankManager; import forestry.core.inventory.FakeInventoryAdapter; @@ -112,8 +113,13 @@ public class FakeGreenhouseController extends FakeMultiblockController implement } @Override - public IClimateControl getClimateControl() { - return DefaultClimateControl.instance; + public IClimateInfo getControlClimate() { + return ClimateInfo.MAX; + } + + @Override + public void setControlClimate(IClimateInfo climateControl) { + } @Override diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 705c91acb..4e20c0cd4 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Set; import java.util.Stack; -import forestry.api.climate.IClimateControl; +import forestry.api.climate.IClimateInfo; import forestry.api.climate.IClimatePosition; import forestry.api.climate.IClimateRegion; import forestry.api.climate.IClimateSourceProvider; @@ -43,6 +43,7 @@ import forestry.api.multiblock.IGreenhouseComponent.ClimateControl; import forestry.api.multiblock.IGreenhouseComponent.Climatiser; import forestry.api.multiblock.IGreenhouseController; import forestry.api.multiblock.IMultiblockComponent; +import forestry.core.climate.ClimateInfo; import forestry.core.climate.ClimatePosition; import forestry.core.climate.ClimateRegion; import forestry.core.config.Constants; @@ -108,10 +109,11 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im this.energyManager = new EnergyManager(200, 100000); this.inventory = new InventoryGreenhouse(this); - camouflagePlainBlock = getDefaultCamouflageBlock(CamouflageManager.DEFAULT); + camouflagePlainBlock = getDefaultCamouflageBlock(CamouflageManager.BLOCK); camouflageGlassBlock = getDefaultCamouflageBlock(CamouflageManager.GLASS); camouflageDoorBlock = getDefaultCamouflageBlock(CamouflageManager.DOOR); this.region = new ClimateRegion(this); + createLogics(); } /* CLIMATE */ @@ -154,7 +156,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im energyManager.writeToNBT(data); inventory.writeToNBT(data); - CamouflageUtil.writeCamouflageBlockToNBT(data, this, CamouflageManager.DEFAULT); + CamouflageUtil.writeCamouflageBlockToNBT(data, this, CamouflageManager.BLOCK); CamouflageUtil.writeCamouflageBlockToNBT(data, this, CamouflageManager.GLASS); CamouflageUtil.writeCamouflageBlockToNBT(data, this, CamouflageManager.DOOR); @@ -177,7 +179,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im energyManager.readFromNBT(data); inventory.readFromNBT(data); - CamouflageUtil.readCamouflageBlockFromNBT(data, this, CamouflageManager.DEFAULT); + CamouflageUtil.readCamouflageBlockFromNBT(data, this, CamouflageManager.BLOCK); CamouflageUtil.readCamouflageBlockFromNBT(data, this, CamouflageManager.GLASS); CamouflageUtil.readCamouflageBlockFromNBT(data, this, CamouflageManager.DOOR); @@ -218,7 +220,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im tankManager.writeData(data); energyManager.writeData(data); inventory.writeData(data); - CamouflageUtil.writeCamouflageBlockToData(data, this, CamouflageManager.DEFAULT); + CamouflageUtil.writeCamouflageBlockToData(data, this, CamouflageManager.BLOCK); CamouflageUtil.writeCamouflageBlockToData(data, this, CamouflageManager.GLASS); CamouflageUtil.writeCamouflageBlockToData(data, this, CamouflageManager.DOOR); region.writeData(data); @@ -237,7 +239,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im @Override public boolean canHandleType(String type) { - return type.equals(CamouflageManager.DEFAULT) || type.equals(CamouflageManager.GLASS) || type.equals(CamouflageManager.DOOR); + return type.equals(CamouflageManager.BLOCK) || type.equals(CamouflageManager.GLASS) || type.equals(CamouflageManager.DOOR); } /* CAMOUFLAGE */ @@ -245,7 +247,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im public boolean setCamouflageBlock(String type, ItemStack camouflageBlock, boolean sendClientUpdate) { ItemStack oldCamouflageBlock; switch (type) { - case CamouflageManager.DEFAULT: + case CamouflageManager.BLOCK: oldCamouflageBlock = camouflagePlainBlock; break; case CamouflageManager.GLASS: @@ -260,7 +262,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im if (!ItemStackUtil.isIdenticalItem(camouflageBlock, oldCamouflageBlock)) { switch (type) { - case CamouflageManager.DEFAULT: + case CamouflageManager.BLOCK: camouflagePlainBlock = camouflageBlock; break; case CamouflageManager.GLASS: @@ -284,7 +286,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im @Override public ItemStack getCamouflageBlock(String type) { switch (type) { - case CamouflageManager.DEFAULT: + case CamouflageManager.BLOCK: return camouflagePlainBlock; case CamouflageManager.GLASS: return camouflageGlassBlock; @@ -298,7 +300,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im @Override public ItemStack getDefaultCamouflageBlock(String type) { switch (type) { - case CamouflageManager.DEFAULT: + case CamouflageManager.BLOCK: return new ItemStack(Blocks.BRICK_BLOCK); case CamouflageManager.GLASS: return new ItemStack(Blocks.STAINED_GLASS, 1, 13); @@ -385,7 +387,6 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im protected void onMachineAssembled() { super.onMachineAssembled(); - createLogics(); Set internalPositions = new HashSet<>(); for (IInternalBlock block : internalBlocks) { if (block != null) { @@ -404,6 +405,9 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im world.markBlockRangeForRenderUpdate(comp.getCoordinates(), comp.getCoordinates()); } } + for(IGreenhouseLogic logic : logics){ + logic.onMachineAssembled(); + } } @Override @@ -424,6 +428,9 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im world.markBlockRangeForRenderUpdate(comp.getCoordinates(), comp.getCoordinates()); } } + for(IGreenhouseLogic logic : logics){ + logic.onMachineDisassembled(); + } } @Override @@ -717,11 +724,18 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im } @Override - public IClimateControl getClimateControl() { + public IClimateInfo getControlClimate() { if (climateControl == null) { - return DefaultClimateControl.instance; + return ClimateInfo.MAX; + } + return climateControl.getControlClimate(); + } + + @Override + public void setControlClimate(IClimateInfo climateControl) { + if (this.climateControl != null) { + this.climateControl.setControlClimate(climateControl); } - return climateControl.getClimateControl(); } @Override diff --git a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java index 62b951489..f9ab531f9 100644 --- a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java +++ b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java @@ -13,7 +13,6 @@ package forestry.greenhouse.multiblock; import javax.annotation.Nullable; import java.util.Set; -import forestry.api.greenhouse.IInternalBlock; import forestry.api.multiblock.IGreenhouseComponent; import forestry.api.multiblock.IGreenhouseController; import forestry.core.fluids.ITankManager; @@ -40,11 +39,6 @@ public interface IGreenhouseControllerInternal extends IGreenhouseController, IM */ EnergyManager getEnergyManager(); - /** - * @return All internal blocks of the greenhouse. - */ - Set getInternalBlocks(); - /** * @return True if the greenhouse can work. */ diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java index 1c7bcfdb0..77d77aa70 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java @@ -104,6 +104,7 @@ public abstract class TileGreenhouse extends MultiblockTileEntityForestry#ErK?hAevDD# zSFi07RgT$K<|;WYp(p0Y`B^^~%5f6M8uNSKH2tHu?ccrcz4w0J=Y5~|`Fx(|$@JxT z7!Zw#0ARrOWcdRiC`5pui*CVj;!n{{H{9EU1$&xV^+;5JTJ*S{=lK96vSuN*#~;O` zM*LT7A9wt;{$Yd+S9tIF0$_XDtoH*hk1bCyqD?%Eq%&v2!ucoeWw{~OaQFMgehtdt zAJ_1mGT)ecL!$Z+k>?$2-h2$s@(1QVYgc{bNCAW68X8hIhsBxoFK2)Gd~)9EfDtdz ziJ?-C%Q^j$bZpG6gGT(De{I_88Y@jF69fCwA~QbZdsI~`81qY0b{kRhp2>us)CQr` zF28j*sCe(O(Cng9n|REwrCiyQFz~Hnz4r59o+Yvlal;+_Kpl zm;l8PaOZif)EveI7bHjq)ayRL5a3$LtfEPefPp5gpu6>5mz{;ZxL8`=KC$D4*`4(ou$6&?G(8J}}l5kp83B5lz)WF5N4y@hLpMaUQ z)p$vQLz()fPieVfpnZhm2~FwoEsB`$NibX?eP=PE#~SE50{d6|(KmrOGGJ(3GTs3) z7Pxv)^7aK>Qd~>Fc-KU~t zf6dK+UIz(|tIG_vYzE(aH0<(2z(`L&cxD<~kYZ8;R1kPWXE&Nz@-23S|I~VALdd$% z8wlc|E?Xd%fdGKgtmo->4q08?+HEZCzh1X=lmvscuC>MAl*6qmNunO`j<29?iva@E zV;vEzr`qq7`+=+})j9;G=9@KJK-!xd`9ZHrs<{yu=H%qKP~c|t$3U%8gjKm8glZeS8oXash$dx7&1_)8s|;kTe3Q-1G=>J5O76% zvn}{Mf3L?qlj;QnlNrlqe4a`_G%g`dIU$`jOw#3strYbxG?3u`8qw3HC(Ipe8;gUI PH6hsU99Erc=r?}@+sfzX literal 3897 zcmeHKTU3)*7T!saJ91G3LV7Ubf+a!XXMQWaDX6$q^bL>SL?n0{q<|4A#R5V^NCH-f1cZcy%n3+Jx~31a=A{qwkahl?wf}wgx4&=i zv;VLCw|g7tF4P48179DHod6j0hyiU)w1kjLBGF=fz-Q++fFv6LW(t5rf!2P21Sf!j zZ~*7;0L%436Iw7a33am>dB|K8}u!cZiLM zw_fYu&Aj;}B7L zV}%is2!^8Af_XxXW0*JCYMi|8)X$HK2dDw{KQxx^{QTh<4qxO_B+Yv)Jf&!D94yYM zfoh%p(Y^-O2fOPJoaox(%#Qencx#6fPP|!|Jkqj*aM=(OeSd!AE5)UzIl=rElB*( zZ!JNi_FGIozE=CJV=wQD|A+-EavRiYQ#6S2Q2|q7SA2B0I+a$a1Lj}2FkdZ;$wujrc+CSREaphg zCHq}Y>?Pd?vEXH`?!lSRJjBmD80Ok6GXk zu=`!k%IVBP;Ynfg(t@_!zCwcCnt<-dWd53K-*oz|Wp!dY&7t`u`Kw18dLHLxX0MepqF=d_1JXMYsJ)iQCpET-owlHW+(1b zVpXS*YPCa;8FPHzRuyfzS{RYOindy@HRQghVw`G4VHBa%MxCNBz+7J!`HnKzGqZxr zE}lb-Z}V59k12Rl4$qc?%g=*52Von#}3lOJ50Ul-XO@ozjlg%uFmg%`}?$z5^d5GR+ z54~=RPOI&+#i~)8prQhl9H$HN=;C5hKj%k9x;$aXVd_wyg<>o!kWN$JOms6QmTMFU zl5(iA-0sk6DXitsK`O4agZZI@(#p{g*PqzxZwh4|3_06F-19ZRPK!DDYLdi|bJ-2o zgkpIplQCJAF*d39;>^>mI8;`dG<%bmX4)v4G8d4yJ=Y>$YpavWpEQy+grB&LC9?KA9Mb`X3y03Yn+!R)arGOo&O~esqi-3U-&5KB2d=e}a9!^L zUQaPp;xUG*XXN^dXJmOrr!@HR1mjJzfA#GV+8QTzLGn3MC8nhi|3hB}iyP2KMq_Pt>Y)@n)Lc*gG@F-v9eoOacR4Uz zlb&)FrJU&a$>LwfN^O&e5VR#5ooa_0^}$9O77^Gw=8ht){{oX0^*OxXJeC=FlQFau zwZui{;fZD1U{e(tC>iVeX4*z@1^i{}uG%IIxy_j9Lj^YDm4ZScIq&XO~96o+;YN`>;bsMIHx<4S*Cj1j#& zL+G*q&QHboppjhE@{|#}1*535sqYaN}wtK+pq7M;m!u)|vKn|85IVFxLR$a$o6{MPr2!MlMS zV!yG_&AC|G<-H1}RivlSUo~Ey-TzWRj)d|o(ye`DuVeAsrCm`7CYfhu-grP1y{4s( z+gA$Xs@JCr+h?u}`-gW^z`sCYzi!?*-OSWpc8A_5T2fSRT8Bw)=DQ|jALk_Vf1H0$ zfPj_ALZmQ0>^Mvu?{HK^zjWkCCI3>$_^iB15uQMk#!0S}Qgar??Z0>9X{U4GR|RUT6li!|SB*%WS-vg1NFVxkaA8UoEq9WIg{w3eNF z8RJI{l2%zv-K8oRBbfY#%YGFkr-zO`scrRdDr{WslAojUMECDqSIxZjYm#LlUKGIZ zePGJ|3m?ni0oR`FsD3zCgV{xAd}^%V{MFH}x*)&bPQM$klTa^PQWmcc_m!5DEv@}t zu|0tm0KfEI(F`5S3$LMgkk~ZMfkDP$?!!;HIltS;bJEkUrKe!*m zT;FzN^UO7?5`6|5+p18&sYo6=fX%n0wU-KC3jT*}G~wmbp%4*8Yac%93+UoJ&npxf zd8itK4$~4xBruJ4k1tBuVVRldho(p&QkEU6(Pf~`j1@)SC^+-C-Hz2|N-=4=c@?7Q z2Cfa}$S#0V?dj=u)?mylf+w7w(*+Fe)PX3J;B%;KOkjg1lMYKuL>m!YTLKG>S5FMw zV}eju^F>3`bJV{)k#hc~+tVYEse8