diff --git a/src/main/java/forestry/api/climate/IClimateManager.java b/src/main/java/forestry/api/climate/IClimateManager.java index 6f4ec9605..59e9873d8 100644 --- a/src/main/java/forestry/api/climate/IClimateManager.java +++ b/src/main/java/forestry/api/climate/IClimateManager.java @@ -34,6 +34,6 @@ public interface IClimateManager { @Nullable IClimateRegion getRegionForPos(World world, BlockPos pos); - Map> getRegions(); + Map> getRegions(); } diff --git a/src/main/java/forestry/api/climate/IClimatePosition.java b/src/main/java/forestry/api/climate/IClimatePosition.java index 6acb7e021..766b9d616 100644 --- a/src/main/java/forestry/api/climate/IClimatePosition.java +++ b/src/main/java/forestry/api/climate/IClimatePosition.java @@ -9,6 +9,9 @@ import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import net.minecraft.util.math.BlockPos; +/** + * A IClimatePosition contains the climate infos (temperature and humidity) of one position. + */ public interface IClimatePosition extends INbtReadable, INbtWritable { IClimateRegion getClimateRegion(); diff --git a/src/main/java/forestry/api/climate/IClimateRegion.java b/src/main/java/forestry/api/climate/IClimateRegion.java index d00f03616..762e4a2f3 100644 --- a/src/main/java/forestry/api/climate/IClimateRegion.java +++ b/src/main/java/forestry/api/climate/IClimateRegion.java @@ -6,7 +6,7 @@ package forestry.api.climate; import java.util.Collection; -import java.util.Map; +import javax.annotation.Nullable; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; @@ -17,25 +17,30 @@ public interface IClimateRegion extends INbtReadable, INbtWritable { World getWorld(); + int getTicksPerUpdate(); + + void setPosition(BlockPos pos, float temperature, float humidity); + + @Nullable + IClimatePosition getPosition(BlockPos pos); + + Collection getPositions(); + + void addSource(IClimateSource source); + + void removeSource(IClimateSource source); + + Collection getSources(); + + void calculateAverageClimate(); + + float getAverageTemperature(); + + float getAverageHumidity(); + /** * Update the climate in a region. */ void updateClimate(int ticks); - int getTicksPerUpdate(); - - Map getPositions(); - - void addSource(IClimateSource source); - - void removeSource(IClimateSource source); - - Collection getSources(); - - Collection getOtherPositions(); - - float getTemperature(); - - float getHumidity(); - } diff --git a/src/main/java/forestry/api/climate/IClimateSourceProvider.java b/src/main/java/forestry/api/climate/IClimateSourceProvider.java index f62561beb..502a27d92 100644 --- a/src/main/java/forestry/api/climate/IClimateSourceProvider.java +++ b/src/main/java/forestry/api/climate/IClimateSourceProvider.java @@ -5,9 +5,14 @@ ******************************************************************************/ package forestry.api.climate; +import java.util.Set; + import forestry.api.core.ILocatable; +import net.minecraft.util.math.BlockPos; public interface IClimateSourceProvider extends ILocatable { IClimateSource getClimateSource(); + + Set getPositionsInRange(); } diff --git a/src/main/java/forestry/api/climate/IClimatiserDefinition.java b/src/main/java/forestry/api/climate/IClimatiserDefinition.java index 4709b6928..2c224a191 100644 --- a/src/main/java/forestry/api/climate/IClimatiserDefinition.java +++ b/src/main/java/forestry/api/climate/IClimatiserDefinition.java @@ -9,7 +9,7 @@ public interface IClimatiserDefinition { float getChange(); - double getRange(); + float getRange(); EnumClimatiserModes getMode(); diff --git a/src/main/java/forestry/api/core/IModelBaker.java b/src/main/java/forestry/api/core/IModelBaker.java index 00f998df8..3cf19674a 100644 --- a/src/main/java/forestry/api/core/IModelBaker.java +++ b/src/main/java/forestry/api/core/IModelBaker.java @@ -7,12 +7,10 @@ package forestry.api.core; import javax.annotation.Nullable; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java b/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java index b80623e9e..99a9ac992 100644 --- a/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseHelper.java @@ -10,7 +10,7 @@ import java.util.List; import forestry.api.multiblock.IGreenhouseController; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.IBlockAccess; public interface IGreenhouseHelper { @@ -18,7 +18,7 @@ public interface IGreenhouseHelper { * @return A {@link IGreenhouseController} of a greenhouse, when the pos is a greenhouse */ @Nullable - IGreenhouseController getGreenhouseController(World world, BlockPos pos); + IGreenhouseController getGreenhouseController(IBlockAccess world, BlockPos pos); void addGreenhouseLogic(Class logic); diff --git a/src/main/java/forestry/api/multiblock/IGreenhouseController.java b/src/main/java/forestry/api/multiblock/IGreenhouseController.java index 4acea836b..63de39232 100644 --- a/src/main/java/forestry/api/multiblock/IGreenhouseController.java +++ b/src/main/java/forestry/api/multiblock/IGreenhouseController.java @@ -5,10 +5,8 @@ ******************************************************************************/ package forestry.api.multiblock; -import javax.annotation.Nullable; import java.util.List; -import forestry.api.climate.IClimateControl; import forestry.api.climate.IClimateControlProvider; import forestry.api.climate.IClimateRegion; import forestry.api.core.ICamouflageHandler; @@ -28,10 +26,6 @@ public interface IGreenhouseController extends IMultiblockController, IGreenhous */ List getLogics(); - @Nullable IClimateRegion getRegion(); - @Override - IClimateControl getClimateControl(); - } diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java index dc0d061b0..76899cf2e 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java @@ -133,7 +133,7 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain @Override public boolean isRaining() { - return world.isRaining(); + return world.isRainingAt(getPosition().up()); } @Override diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockWoodDoor.java b/src/main/java/forestry/arboriculture/items/ItemBlockWoodDoor.java index 11c056779..4992e57b5 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockWoodDoor.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWoodDoor.java @@ -38,7 +38,7 @@ public class ItemBlockWoodDoor extends ItemBlockWood { ItemStack itemstack = player.getHeldItem(hand); if (player.canPlayerEdit(pos, facing, itemstack) && this.block.canPlaceBlockAt(worldIn, pos)) { - EnumFacing enumfacing = EnumFacing.fromAngle((double) player.rotationYaw); + EnumFacing enumfacing = EnumFacing.fromAngle(player.rotationYaw); int i = enumfacing.getFrontOffsetX(); int j = enumfacing.getFrontOffsetZ(); boolean flag = i < 0 && hitZ < 0.5F || i > 0 && hitZ > 0.5F || j < 0 && hitX > 0.5F || j > 0 && hitX < 0.5F; diff --git a/src/main/java/forestry/arboriculture/models/ModelLeaves.java b/src/main/java/forestry/arboriculture/models/ModelLeaves.java index aee080634..2b7661c53 100644 --- a/src/main/java/forestry/arboriculture/models/ModelLeaves.java +++ b/src/main/java/forestry/arboriculture/models/ModelLeaves.java @@ -24,7 +24,6 @@ import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.ModelBlockCached; import forestry.core.proxy.Proxies; import forestry.core.tiles.TileUtil; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; diff --git a/src/main/java/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java index 7a8fb2f17..0fcbe5609 100755 --- a/src/main/java/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -10,9 +10,21 @@ ******************************************************************************/ package forestry.core; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.TreeManager; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.apiculture.genetics.Bee; +import forestry.apiculture.genetics.BeeDefinition; +import forestry.arboriculture.genetics.Tree; +import forestry.arboriculture.genetics.TreeDefinition; import forestry.core.config.Constants; +import forestry.lepidopterology.genetics.Butterfly; +import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.plugins.ForestryPluginUids; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -57,14 +69,11 @@ public class CreativeTabForestry extends CreativeTabs { iconItem = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Constants.MOD_ID, "ffarm")); break; case 2: - iconItem = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Constants.MOD_ID, "beeDroneGE")); - break; + return BeeManager.beeRoot.getMemberStack(new Bee(BeeDefinition.FOREST.getGenome()), EnumBeeType.DRONE); case 3: - iconItem = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Constants.MOD_ID, "sapling")); - break; + return TreeManager.treeRoot.getMemberStack(new Tree(TreeDefinition.Oak.getGenome()), EnumGermlingType.SAPLING); case 4: - iconItem = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Constants.MOD_ID, "butterflyGE")); - break; + return ButterflyManager.butterflyRoot.getMemberStack(new Butterfly(ButterflyDefinition.Brimstone.getGenome()), EnumFlutterType.BUTTERFLY); default: iconItem = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Constants.MOD_ID, "fertilizerCompound")); break; diff --git a/src/main/java/forestry/core/climate/ClimateEventHandler.java b/src/main/java/forestry/core/climate/ClimateEventHandler.java index 2eadd8977..cbe652b37 100644 --- a/src/main/java/forestry/core/climate/ClimateEventHandler.java +++ b/src/main/java/forestry/core/climate/ClimateEventHandler.java @@ -23,7 +23,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; public class ClimateEventHandler { - private final Map serverTicks; + private final Map serverTicks; public ClimateEventHandler() { serverTicks = new HashMap<>(); @@ -156,18 +156,17 @@ public class ClimateEventHandler { MinecraftServer server = world.getMinecraftServer(); if (server != null) { server.addScheduledTask(() -> { - Integer dim = event.world.provider.getDimension(); - if (!serverTicks.containsKey(dim)) { - serverTicks.put(dim, 1); + if (!serverTicks.containsKey(world)) { + serverTicks.put(world, 1); } - int ticks = serverTicks.get(dim); - Map> regions = ForestryAPI.climateManager.getRegions(); - if (regions.containsKey(dim)) { - for (IClimateRegion region : regions.get(dim)) { + int ticks = serverTicks.get(world); + Map> regions = ForestryAPI.climateManager.getRegions(); + if (regions.containsKey(world)) { + for (IClimateRegion region : regions.get(world)) { region.updateClimate(ticks); } } - serverTicks.put(dim, ticks + 1); + serverTicks.put(world, ticks + 1); }); } } diff --git a/src/main/java/forestry/core/climate/ClimateManager.java b/src/main/java/forestry/core/climate/ClimateManager.java index 2b506f1ba..d23cf5d6f 100644 --- a/src/main/java/forestry/core/climate/ClimateManager.java +++ b/src/main/java/forestry/core/climate/ClimateManager.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import forestry.api.climate.IClimateManager; import forestry.api.climate.IClimatePosition; import forestry.api.climate.IClimateProvider; @@ -27,7 +26,7 @@ import net.minecraft.world.World; public class ClimateManager implements IClimateManager { - protected final Map> regions; + protected final Map> regions; private final Object regionsMutex; public ClimateManager() { @@ -38,15 +37,17 @@ public class ClimateManager implements IClimateManager { @Override public void addRegion(IClimateRegion region) { synchronized (regionsMutex) { - Integer dimensionID = region.getWorld().provider.getDimension(); - if (!regions.containsKey(dimensionID)) { - this.regions.put(dimensionID, new ArrayList<>()); + World world = region.getWorld(); + if (!regions.containsKey(world)) { + this.regions.put(world, new ArrayList<>()); } - List regions = this.regions.get(dimensionID); + List regions = this.regions.get(world); if (!regions.contains(region)) { - for (BlockPos pos : region.getPositions().keySet()) { - if (getRegionForPos(region.getWorld(), pos) != null) { - return; + if(!regions.isEmpty()){ + for (IClimatePosition pos : region.getPositions()) { + if (getRegionForPos(world, pos.getPos()) != null) { + return; + } } } regions.add(region); @@ -57,23 +58,21 @@ public class ClimateManager implements IClimateManager { @Override public void removeRegion(IClimateRegion region) { synchronized (regionsMutex) { - Integer dimensionID = region.getWorld().provider.getDimension(); - if (!regions.containsKey(dimensionID)) { - this.regions.put(dimensionID, new ArrayList<>()); - } - List regions = this.regions.get(dimensionID); - if (regions.contains(region)) { - regions.remove(region); + World world = region.getWorld(); + if (!regions.containsKey(world)) { + this.regions.put(world, new ArrayList<>()); } + List regions = this.regions.get(world); + regions.remove(region); } } @Override public void removeSource(IClimateSourceProvider source) { synchronized (regionsMutex) { - Integer dimensionID = source.getWorldObj().provider.getDimension(); - if (!regions.containsKey(dimensionID)) { - regions.put(dimensionID, new ArrayList<>()); + World world = source.getWorldObj(); + if (!regions.containsKey(world)) { + regions.put(world, new ArrayList<>()); } IClimateRegion region = getRegionForPos(source.getWorldObj(), source.getCoordinates()); if (region != null) { @@ -87,9 +86,9 @@ public class ClimateManager implements IClimateManager { @Override public void addSource(IClimateSourceProvider source) { synchronized (regionsMutex) { - Integer dimensionID = source.getWorldObj().provider.getDimension(); - if (!regions.containsKey(dimensionID)) { - regions.put(dimensionID, new ArrayList<>()); + World world = source.getWorldObj(); + if (!regions.containsKey(world)) { + regions.put(world, new ArrayList<>()); } IClimateRegion region = getRegionForPos(source.getWorldObj(), source.getCoordinates()); if (region != null) { @@ -121,20 +120,20 @@ public class ClimateManager implements IClimateManager { } @Override - public Map> getRegions() { + public Map> getRegions() { return regions; } @Override public IClimatePosition getPosition(World world, BlockPos pos) { - Integer dimensionID = world.provider.getDimension(); - if (!regions.containsKey(dimensionID)) { - regions.put(dimensionID, new ArrayList<>()); + if (!regions.containsKey(world)) { + regions.put(world, new ArrayList<>()); return null; } - for (IClimateRegion region : regions.get(dimensionID)) { - if (region.getPositions().keySet().contains(pos)) { - return region.getPositions().get(pos); + for (IClimateRegion region : regions.get(world)) { + IClimatePosition position = region.getPosition(pos); + if(position != null){ + return position; } } return null; @@ -142,15 +141,12 @@ public class ClimateManager implements IClimateManager { @Override public IClimateRegion getRegionForPos(World world, BlockPos pos) { - Integer dimensionID = world.provider.getDimension(); - if (!regions.containsKey(dimensionID)) { - this.regions.put(dimensionID, new ArrayList<>()); + if (!regions.containsKey(world)) { + this.regions.put(world, new ArrayList<>()); } - List regions = this.regions.get(dimensionID); + List regions = this.regions.get(world); for (IClimateRegion region : regions) { - if (region.getPositions().keySet().contains(pos)) { - return region; - } else if (region.getOtherPositions().contains(pos)) { + if (region.getPosition(pos) != null) { return region; } } diff --git a/src/main/java/forestry/core/climate/ClimatePosition.java b/src/main/java/forestry/core/climate/ClimatePosition.java index 477d8d209..19404bbeb 100644 --- a/src/main/java/forestry/core/climate/ClimatePosition.java +++ b/src/main/java/forestry/core/climate/ClimatePosition.java @@ -17,37 +17,36 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; public class ClimatePosition implements IClimatePosition { - protected final IClimateRegion climateRegion; + protected final IClimateRegion region; protected final BlockPos pos; protected float temperature; protected float humidity; - public ClimatePosition(IClimateRegion climateRegion, BlockPos pos, NBTTagCompound nbtTag) { - this.climateRegion = climateRegion; + public ClimatePosition(IClimateRegion rRegion, BlockPos pos, NBTTagCompound nbtTag) { + this.region = rRegion; this.pos = pos; readFromNBT(nbtTag); } - public ClimatePosition(IClimateRegion climateRegion, BlockPos pos) { - Biome biome = climateRegion.getWorld().getBiome(pos); - this.climateRegion = climateRegion; + public ClimatePosition(IClimateRegion region, BlockPos pos) { + Biome biome = region.getWorld().getBiome(pos); + this.region = region; this.pos = pos; this.temperature = biome.getTemperature(); this.humidity = biome.getRainfall(); } - public ClimatePosition(IClimateRegion climateRegion, BlockPos pos, float temperature, float humidity) { - this.climateRegion = climateRegion; + public ClimatePosition(IClimateRegion region, BlockPos pos, float temperature, float humidity) { + this.region = region; this.pos = pos; this.temperature = temperature; this.humidity = humidity; } - @Override public IClimateRegion getClimateRegion() { - return climateRegion; + return region; } @Override diff --git a/src/main/java/forestry/core/climate/ClimateRegion.java b/src/main/java/forestry/core/climate/ClimateRegion.java new file mode 100644 index 000000000..3cf68a618 --- /dev/null +++ b/src/main/java/forestry/core/climate/ClimateRegion.java @@ -0,0 +1,296 @@ +/******************************************************************************* + * 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 java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +import forestry.api.climate.IClimateControl; +import forestry.api.climate.IClimatePosition; +import forestry.api.climate.IClimateRegion; +import forestry.api.climate.IClimateSource; +import forestry.core.network.IStreamable; +import forestry.core.network.PacketBufferForestry; +import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class ClimateRegion implements IClimateRegion, IStreamable { + protected final World world; + protected final IGreenhouseControllerInternal controller; + protected final Set positions; + protected final Set sources; + protected float temperature; + protected float humidity; + + public ClimateRegion(IGreenhouseControllerInternal controller, Set positions) { + this.world = controller.getWorldObj(); + this.controller = controller; + this.positions = positions; + this.sources = new HashSet<>(); + calculateAverageClimate(); + } + + /** + * Creates an empty region. + */ + public ClimateRegion(IGreenhouseControllerInternal controller) { + this.world = controller.getWorldObj(); + this.controller = controller; + this.positions = new HashSet<>(); + this.sources = new HashSet<>(); + } + + + public ClimateRegion(IGreenhouseControllerInternal controller, NBTTagCompound nbtTag) { + this.world = controller.getWorldObj(); + this.controller = controller; + this.positions = new HashSet<>(); + this.sources = new HashSet<>(); + readFromNBT(nbtTag); + calculateAverageClimate(); + } + + @Override + public void calculateAverageClimate(){ + humidity = 0.0F; + temperature = 0.0F; + if(!positions.isEmpty()){ + int positions = 0; + for (IClimatePosition position : this.positions) { + if (position != null) { + positions++; + humidity += position.getHumidity(); + temperature += position.getTemperature(); + } + } + + temperature /= positions; + humidity /= positions; + } + } + + @Override + public void updateClimate(int ticks) { + boolean hasChange = false; + for (IClimateSource source : sources) { + if (source != null) { + if (ticks % source.getTicksForChange(this) == 0) { + hasChange |= source.changeClimate(ticks, this); + } + } + } + if (ticks % getTicksPerUpdate() == 0) { + for (IClimatePosition position : positions) { + BlockPos pos = position.getPos(); + if (world.isBlockLoaded(pos)) { + hasChange |= updateSides(position); + if (!controller.isAssembled()) { + IClimateControl climateControl = getControl(pos); + + if (position.getTemperature() != climateControl.getControlTemperature()) { + if (position.getTemperature() > climateControl.getControlTemperature()) { + position.addTemperature(-Math.min(0.01F, position.getTemperature() - climateControl.getControlTemperature())); + hasChange = true; + } else { + position.addTemperature(Math.min(0.01F, climateControl.getControlTemperature() - position.getTemperature())); + hasChange = true; + } + } + if (position.getHumidity() != climateControl.getControlHumidity()) { + if (position.getHumidity() > climateControl.getControlHumidity()) { + position.addHumidity(-Math.min(0.01F, position.getHumidity() - climateControl.getControlHumidity())); + hasChange = true; + } else { + position.addHumidity(Math.min(0.01F, climateControl.getControlHumidity() - position.getHumidity())); + hasChange = true; + } + } + } + } + } + } + if (hasChange) { + calculateAverageClimate(); + } + } + + protected boolean updateSides(IClimatePosition positon) { + BlockPos pos = positon.getPos(); + IClimateControl climateControl = getControl(pos); + boolean hasChange = false; + if (climateControl.getControlTemperature() != temperature || climateControl.getControlHumidity() != humidity) { + for (EnumFacing facing : EnumFacing.VALUES) { + IClimatePosition climatedInfoFace = getPosition(pos.offset(facing)); + if (climatedInfoFace != null) { + if (positon.getTemperature() > climatedInfoFace.getTemperature() + 0.01F) { + float change = Math.min(0.01F, positon.getTemperature() - climatedInfoFace.getTemperature()); + positon.addTemperature(-change); + climatedInfoFace.addTemperature(change); + hasChange = true; + } + if (positon.getHumidity() > climatedInfoFace.getHumidity() + 0.01F) { + float change = Math.min(0.01F, positon.getHumidity() - climatedInfoFace.getHumidity()); + positon.addHumidity(-change); + climatedInfoFace.addHumidity(change); + hasChange = true; + } + } + } + } + return hasChange; + } + + protected IClimateControl getControl(BlockPos pos) { + if (world.isBlockLoaded(pos)) { + if (!controller.isAssembled()) { + return BiomeClimateControl.getControl(world.getBiome(pos)); + } + } + return controller.getClimateControl(); + } + + @Override + public Collection getPositions() { + return positions; + } + + @Override + public IClimatePosition getPosition(BlockPos pos) { + for(IClimatePosition position : positions){ + if(position.getPos().equals(pos)){ + return position; + } + } + return null; + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + NBTTagList positionList = new NBTTagList(); + for (IClimatePosition positon : positions) { + BlockPos pos = positon.getPos(); + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("X", pos.getX()); + tag.setInteger("Y", pos.getY()); + tag.setInteger("Z", pos.getZ()); + positionList.appendTag(positon.writeToNBT(tag)); + } + nbt.setTag("Positions", positionList); + return nbt; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + NBTTagList positionList = nbt.getTagList("Positions", 10); + for (int i = 0; i < positionList.tagCount(); i++) { + NBTTagCompound positionTag = positionList.getCompoundTagAt(i); + int xPos = positionTag.getInteger("X"); + int yPos = positionTag.getInteger("Y"); + int zPos = positionTag.getInteger("Z"); + BlockPos pos = new BlockPos(xPos, yPos, zPos); + IClimatePosition position = getPosition(pos); + if (position != null) { + position.readFromNBT(positionTag); + } else { + positions.add(new ClimatePosition(this, pos, positionTag)); + } + } + } + + @Override + public int getTicksPerUpdate() { + return 20; + } + + @Override + public World getWorld() { + return world; + } + + @Override + public synchronized void setPosition(BlockPos pos, float temperature, float humidity) { + IClimatePosition position = getPosition(pos); + if (position != null) { + position.setHumidity(humidity); + position.setTemperature(temperature); + } else { + positions.add(new ClimatePosition(this, pos, temperature, humidity)); + } + } + + @Override + public synchronized void addSource(IClimateSource source) { + if (!sources.contains(source)) { + sources.add(source); + } + } + + @Override + public synchronized void removeSource(IClimateSource source) { + if (sources.contains(source)) { + sources.remove(source); + } + } + + @Override + public Collection getSources() { + return sources; + } + + @Override + public void writeData(PacketBufferForestry data) { + if (!positions.isEmpty()) { + data.writeInt(positions.size()); + data.writeFloat(temperature); + data.writeFloat(humidity); + } else { + data.writeInt(0); + } + } + + @Override + public void readData(PacketBufferForestry data) throws IOException { + int size = data.readInt(); + if (size != 0) { + temperature = data.readFloat(); + humidity = data.readFloat(); + } + } + + @Override + public float getAverageTemperature() { + return temperature; + } + + @Override + public float getAverageHumidity() { + return humidity; + } + + @Override + public boolean equals(Object obj) { + if(!(obj instanceof ClimateRegion)){ + return false; + } + ClimateRegion region = (ClimateRegion) obj; + if(region.controller != controller){ + return false; + } + return true; + } + +} diff --git a/src/main/java/forestry/core/climate/ClimateRoom.java b/src/main/java/forestry/core/climate/ClimateRoom.java deleted file mode 100644 index dedf48b6b..000000000 --- a/src/main/java/forestry/core/climate/ClimateRoom.java +++ /dev/null @@ -1,318 +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 java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import forestry.api.climate.IClimateControl; -import forestry.api.climate.IClimatePosition; -import forestry.api.climate.IClimateRegion; -import forestry.api.climate.IClimateSource; -import forestry.core.network.IStreamable; -import forestry.core.network.PacketBufferForestry; -import forestry.core.utils.ClimateUtil; -import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class ClimateRoom implements IClimateRegion, IStreamable { - - protected final World world; - protected final IGreenhouseControllerInternal controller; - protected final Map positions; - protected final List wallPositions; - protected final List sources; - protected float temperature; - protected float humidity; - - public ClimateRoom(ClimateRoom oldRoom, Map newPositions, List newWallPositions) { - this.world = oldRoom.getWorld(); - this.controller = oldRoom.controller; - this.positions = new HashMap<>(); - this.wallPositions = newWallPositions; - this.sources = new ArrayList<>(); - for (Entry positionEntry : newPositions.entrySet()) { - BlockPos pos = positionEntry.getKey(); - IClimatePosition position = positionEntry.getValue(); - IClimatePosition oldPosition = oldRoom.getPositions().get(pos); - float temperature = position.getTemperature(); - float humidity = position.getHumidity(); - if (oldPosition != null) { - temperature = oldPosition.getTemperature(); - humidity = oldPosition.getHumidity(); - } - addPosition(pos, temperature, humidity); - } - this.temperature = getExactTemperature(); - this.humidity = getExactHumidity(); - } - - public ClimateRoom(IGreenhouseControllerInternal controller, Map innerPositions, List wallPositions) { - this.world = controller.getWorldObj(); - this.controller = controller; - this.positions = innerPositions; - this.wallPositions = wallPositions; - this.sources = new ArrayList<>(); - this.temperature = getExactTemperature(); - this.humidity = getExactHumidity(); - } - - public ClimateRoom(IGreenhouseControllerInternal controller, List wallPositions, NBTTagCompound nbtTag) { - this.world = controller.getWorldObj(); - this.controller = controller; - this.positions = new HashMap<>(); - this.wallPositions = new ArrayList<>(); - this.sources = new ArrayList<>(); - readFromNBT(nbtTag); - this.temperature = getExactTemperature(); - this.humidity = getExactHumidity(); - } - - private float getExactTemperature() { - float temperature = 0.0F; - int positions = 0; - - for (IClimatePosition position : this.positions.values()) { - if (position != null) { - positions++; - temperature += position.getTemperature(); - } - } - return temperature / positions; - } - - private float getExactHumidity() { - float humidity = 0.0F; - int positions = 0; - - for (IClimatePosition position : this.positions.values()) { - if (position != null) { - positions++; - humidity += position.getHumidity(); - } - } - return humidity / positions; - } - - @Override - public void updateClimate(int ticks) { - boolean hasChange = false; - ; - for (IClimateSource source : sources) { - if (source != null) { - if (ticks % source.getTicksForChange(this) == 0) { - hasChange |= source.changeClimate(ticks, this); - } - } - } - if (ticks % getTicksPerUpdate() == 0) { - for (Entry position : positions.entrySet()) { - BlockPos pos = position.getKey(); - if (world.isBlockLoaded(pos)) { - hasChange |= updateSides(pos); - - if (!controller.isAssembled()) { - IClimateControl climateControl = getControl(pos); - IClimatePosition climatedInfo = positions.get(pos); - - if (climatedInfo.getTemperature() != climateControl.getControlTemperature()) { - if (climatedInfo.getTemperature() > climateControl.getControlTemperature()) { - climatedInfo.addTemperature(-Math.min(0.01F, climatedInfo.getTemperature() - climateControl.getControlTemperature())); - hasChange = true; - } else { - climatedInfo.addTemperature(Math.min(0.01F, climateControl.getControlTemperature() - climatedInfo.getTemperature())); - hasChange = true; - } - } - if (climatedInfo.getHumidity() != climateControl.getControlHumidity()) { - if (climatedInfo.getHumidity() > climateControl.getControlHumidity()) { - climatedInfo.addHumidity(-Math.min(0.01F, climatedInfo.getHumidity() - climateControl.getControlHumidity())); - hasChange = true; - } else { - climatedInfo.addHumidity(Math.min(0.01F, climateControl.getControlHumidity() - climatedInfo.getHumidity())); - hasChange = true; - } - } - } - } - } - } - if (hasChange) { - temperature = getExactTemperature(); - humidity = getExactHumidity(); - } - } - - protected boolean updateSides(BlockPos pos) { - IClimatePosition climatedInfo = positions.get(pos); - IClimateControl climateControl = getControl(pos); - boolean hasChange = false; - if (climateControl.getControlTemperature() != temperature || climateControl.getControlHumidity() != humidity) { - for (EnumFacing facing : EnumFacing.VALUES) { - IClimatePosition climatedInfoFace = positions.get(pos.offset(facing)); - if (climatedInfoFace != null) { - if (climatedInfo.getTemperature() > climatedInfoFace.getTemperature() + 0.01F) { - float change = Math.min(0.01F, climatedInfo.getTemperature() - climatedInfoFace.getTemperature()); - climatedInfo.addTemperature(-change); - climatedInfoFace.addTemperature(change); - hasChange = true; - } - if (climatedInfo.getHumidity() > climatedInfoFace.getHumidity() + 0.01F) { - float change = Math.min(0.01F, climatedInfo.getHumidity() - climatedInfoFace.getHumidity()); - climatedInfo.addHumidity(-change); - climatedInfoFace.addHumidity(change); - hasChange = true; - } - } - } - } - return hasChange; - } - - protected IClimateControl getControl(BlockPos pos) { - if (world.isBlockLoaded(pos)) { - if (!controller.isAssembled()) { - return BiomeClimateControl.getControl(world.getBiome(pos)); - } - } - return controller.getClimateControl(); - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - NBTTagList positionList = new NBTTagList(); - for (Entry entry : positions.entrySet()) { - BlockPos pos = entry.getKey(); - NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("X", pos.getX()); - tag.setInteger("Y", pos.getY()); - tag.setInteger("Z", pos.getZ()); - positionList.appendTag(entry.getValue().writeToNBT(tag)); - } - nbt.setTag("Positions", positionList); - return nbt; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - NBTTagList positionList = nbt.getTagList("Positions", 10); - for (int i = 0; i < positionList.tagCount(); i++) { - NBTTagCompound positionTag = positionList.getCompoundTagAt(i); - int xPos = positionTag.getInteger("X"); - int yPos = positionTag.getInteger("Y"); - int zPos = positionTag.getInteger("Z"); - BlockPos pos = new BlockPos(xPos, yPos, zPos); - IClimatePosition position = positions.get(pos); - if (position != null) { - position.readFromNBT(positionTag); - } else { - positions.put(pos, new ClimatePosition(this, pos, positionTag)); - } - } - } - - @Override - public int getTicksPerUpdate() { - return 20; - } - - @Override - public World getWorld() { - return world; - } - - @Override - public Map getPositions() { - return positions; - } - - public synchronized void addPosition(BlockPos pos, float temperature, float humidity) { - IClimatePosition otherPosition = positions.get(pos); - if (otherPosition != null) { - otherPosition.setHumidity(humidity); - otherPosition.setTemperature(temperature); - } else { - positions.put(pos, new ClimatePosition(this, pos, temperature, humidity)); - } - } - - @Override - public synchronized void addSource(IClimateSource source) { - if (!sources.contains(source)) { - sources.add(source); - } - } - - @Override - public synchronized void removeSource(IClimateSource source) { - if (sources.contains(source)) { - sources.remove(source); - } - } - - @Override - public Collection getSources() { - return sources; - } - - @Override - public List getOtherPositions() { - return wallPositions; - } - - @Override - public void writeData(PacketBufferForestry data) { - if (!positions.isEmpty()) { - data.writeInt(positions.size()); - for (IClimatePosition pos : positions.values()) { - ClimateUtil.writeRoomPositionData(pos, data); - } - data.writeFloat(temperature); - data.writeFloat(humidity); - } else { - data.writeInt(0); - } - } - - @Override - public void readData(PacketBufferForestry data) throws IOException { - int size = data.readInt(); - if (size != 0) { - positions.clear(); - ; - for (int index = 0; index < size; index++) { - ClimateUtil.readRoomPositionData(this, data); - } - temperature = data.readFloat(); - humidity = data.readFloat(); - } - } - - @Override - public float getTemperature() { - return temperature; - } - - @Override - public float getHumidity() { - return humidity; - } - -} diff --git a/src/main/java/forestry/core/climate/ClimatiserDefinition.java b/src/main/java/forestry/core/climate/ClimatiserDefinition.java index 763cd646f..bee37fe6c 100644 --- a/src/main/java/forestry/core/climate/ClimatiserDefinition.java +++ b/src/main/java/forestry/core/climate/ClimatiserDefinition.java @@ -18,10 +18,10 @@ public class ClimatiserDefinition implements IClimatiserDefinition { protected final float change; protected final EnumClimatiserModes mode; - protected final double range; + protected final float range; protected final EnumClimatiserTypes type; - public ClimatiserDefinition(float change, EnumClimatiserModes mode, double range, EnumClimatiserTypes type) { + public ClimatiserDefinition(float change, EnumClimatiserModes mode, float range, EnumClimatiserTypes type) { this.change = change; this.mode = mode; this.range = range; @@ -34,7 +34,7 @@ public class ClimatiserDefinition implements IClimatiserDefinition { } @Override - public double getRange() { + public float getRange() { return range; } diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 7e8a97cc0..4a13ff112 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -81,7 +81,8 @@ public abstract class GuiForestry ext int maxLedgerWidth = (this.width - this.xSize) / 2; this.ledgerManager.setMaxWidth(maxLedgerWidth); - + this.ledgerManager.clear(); + addLedgers(); } @@ -247,10 +248,12 @@ public abstract class GuiForestry ext return ySize; } + @Override public int getGuiLeft() { return guiLeft; } + @Override public int getGuiTop() { return guiTop; } diff --git a/src/main/java/forestry/core/gui/ledgers/LedgerManager.java b/src/main/java/forestry/core/gui/ledgers/LedgerManager.java index 04313c52e..673331e0f 100644 --- a/src/main/java/forestry/core/gui/ledgers/LedgerManager.java +++ b/src/main/java/forestry/core/gui/ledgers/LedgerManager.java @@ -49,6 +49,10 @@ public class LedgerManager { errorLedgers.add(new ErrorLedger(this)); } } + + public void clear(){ + this.ledgers.clear(); + } public void add(Ledger ledger) { this.ledgers.add(ledger); diff --git a/src/main/java/forestry/core/items/ItemRegistry.java b/src/main/java/forestry/core/items/ItemRegistry.java index 142a87c7d..79ca9f0d2 100644 --- a/src/main/java/forestry/core/items/ItemRegistry.java +++ b/src/main/java/forestry/core/items/ItemRegistry.java @@ -12,7 +12,6 @@ package forestry.core.items; import java.util.Locale; -import com.google.common.base.Preconditions; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.plugins.PluginManager; diff --git a/src/main/java/forestry/core/models/ModelBlockDefault.java b/src/main/java/forestry/core/models/ModelBlockDefault.java index 58b50fdba..86ef4057e 100644 --- a/src/main/java/forestry/core/models/ModelBlockDefault.java +++ b/src/main/java/forestry/core/models/ModelBlockDefault.java @@ -32,7 +32,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/forestry/core/models/baker/ModelBakerFace.java b/src/main/java/forestry/core/models/baker/ModelBakerFace.java index aa33b4cb3..11c426fac 100644 --- a/src/main/java/forestry/core/models/baker/ModelBakerFace.java +++ b/src/main/java/forestry/core/models/baker/ModelBakerFace.java @@ -14,7 +14,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.util.vector.Vector3f; /** * A face of a {@link ModelBakerModel } diff --git a/src/main/java/forestry/core/multiblock/MultiblockRegistry.java b/src/main/java/forestry/core/multiblock/MultiblockRegistry.java index 89059b1a7..7edf3a7a3 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockRegistry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockRegistry.java @@ -7,6 +7,7 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; import forestry.api.multiblock.IMultiblockComponent; import forestry.core.utils.Log; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; /** @@ -116,7 +117,7 @@ public class MultiblockRegistry { * @param world The world whose controllers you wish to retrieve. * @return An unmodifiable set of controllers active in the given world. */ - public static Set getControllersFromWorld(World world) { + public static Set getControllersFromWorld(IBlockAccess world) { if (registries.containsKey(world)) { return registries.get(world).getControllers(); } diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index 237c78fab..5cfb85102 100644 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -12,7 +12,6 @@ package forestry.core.network; import java.io.IOException; -import com.google.common.base.Preconditions; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import net.minecraft.client.Minecraft; @@ -51,7 +50,10 @@ public class PacketHandler { public void onPacket(ClientCustomPacketEvent event) { PacketBufferForestry data = new PacketBufferForestry(event.getPacket().payload()); EntityPlayer player = Proxies.common.getPlayer(); - + if(player == null){ + return; + } + byte packetIdOrdinal = data.readByte(); PacketIdClient packetId = PacketIdClient.VALUES[packetIdOrdinal]; IForestryPacketHandlerClient packetHandler = packetId.getPacketHandler(); diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 0883289d6..ce3d04867 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -12,6 +12,8 @@ package forestry.core.proxy; import java.io.File; +import javax.annotation.Nullable; + import forestry.core.TickHandlerCoreServer; import forestry.core.multiblock.MultiblockServerTickHandler; import forestry.core.worldgen.WorldGenerator; @@ -77,6 +79,7 @@ public class ProxyCommon { return FMLClientHandler.instance().getClient(); } + @Nullable public EntityPlayer getPlayer() { return null; } diff --git a/src/main/java/forestry/core/utils/ClimateUtil.java b/src/main/java/forestry/core/utils/ClimateUtil.java index 9a93856e9..8eaaa28d2 100644 --- a/src/main/java/forestry/core/utils/ClimateUtil.java +++ b/src/main/java/forestry/core/utils/ClimateUtil.java @@ -18,7 +18,7 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IClimateHelper; -import forestry.core.climate.ClimateRoom; +import forestry.core.climate.ClimateRegion; import forestry.core.network.PacketBufferForestry; public class ClimateUtil implements IClimateHelper { @@ -214,8 +214,8 @@ public class ClimateUtil implements IClimateHelper { data.writeFloat(position.getHumidity()); } - public static void readRoomPositionData(ClimateRoom room, PacketBufferForestry data) { - room.addPosition(data.readBlockPos(), data.readFloat(), data.readFloat()); + public static void readRoomPositionData(ClimateRegion room, PacketBufferForestry data) { + room.setPosition(data.readBlockPos(), data.readFloat(), data.readFloat()); } public static void readPositionData(IClimatePosition position, PacketBufferForestry data) { diff --git a/src/main/java/forestry/energy/EnergyHelper.java b/src/main/java/forestry/energy/EnergyHelper.java index a21101bbf..f73c1cdc9 100644 --- a/src/main/java/forestry/energy/EnergyHelper.java +++ b/src/main/java/forestry/energy/EnergyHelper.java @@ -88,6 +88,9 @@ public class EnergyHelper { } public static boolean isEnergyReceiverOrEngine(EnumFacing side, TileEntity tile) { + if(tile == null){ + return false; + } if (tile instanceof TileEngine) { // engine chaining return true; } diff --git a/src/main/java/forestry/farming/models/ModelFarmBlock.java b/src/main/java/forestry/farming/models/ModelFarmBlock.java index 31c2c6ecc..99afcc135 100644 --- a/src/main/java/forestry/farming/models/ModelFarmBlock.java +++ b/src/main/java/forestry/farming/models/ModelFarmBlock.java @@ -10,7 +10,6 @@ import forestry.core.tiles.TileUtil; import forestry.farming.blocks.BlockFarm; import forestry.farming.blocks.EnumFarmBlockType; import forestry.farming.tiles.TileFarm; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/greenhouse/GreenhouseClimateSource.java b/src/main/java/forestry/greenhouse/GreenhouseClimateSource.java index c52725f97..26a8fb9fe 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseClimateSource.java +++ b/src/main/java/forestry/greenhouse/GreenhouseClimateSource.java @@ -25,6 +25,9 @@ import net.minecraft.util.math.BlockPos; public class GreenhouseClimateSource

extends ClimateSource

{ + private static final int COOLDOWN = 10; + private int currentCooldown; + public GreenhouseClimateSource(int ticksForChange) { super(ticksForChange); } @@ -34,6 +37,10 @@ public class GreenhouseClimateSource

extends if (provider == null) { return false; } + if(currentCooldown > 0){ + currentCooldown--; + return false; + } IClimatiserDefinition definition = provider.getDefinition(); IMultiblockLogic logic = provider.getMultiblockLogic(); IMultiblockController controller = logic.getController(); @@ -52,22 +59,22 @@ public class GreenhouseClimateSource

extends float maxChange = definition.getChange(); if (isActive) { if (canChange(type, EnumClimatiserTypes.TEMPERATURE)) { - if (region.getTemperature() < controlTemp) { + if (region.getAverageTemperature() < controlTemp) { if (!canChange(mode, EnumClimatiserModes.POSITIVE)) { isActive = false; } - } else if (region.getTemperature() > controlTemp) { + } else if (region.getAverageTemperature() > controlTemp) { if (!canChange(mode, EnumClimatiserModes.NEGATIVE)) { isActive = false; } } } if (canChange(type, EnumClimatiserTypes.HUMIDITY)) { - if (region.getTemperature() < controlHum) { + if (region.getAverageTemperature() < controlHum) { if (!canChange(mode, EnumClimatiserModes.POSITIVE)) { isActive = false; } - } else if (region.getTemperature() > controlHum) { + } else if (region.getAverageTemperature() > controlHum) { if (!canChange(mode, EnumClimatiserModes.NEGATIVE)) { isActive = false; } @@ -77,39 +84,37 @@ public class GreenhouseClimateSource

extends if (isActive) { for (BlockPos pos : positionsInRange) { - IClimatePosition position = region.getPositions().get(pos); + IClimatePosition position = region.getPosition(pos); if (position != null) { double distance = pos.distanceSq(provider.getCoordinates()); double range = definition.getRange(); - if (distance <= range) { - float change = maxChange; - if (distance > 0) { - change = (float) (maxChange / distance); - } - if (canChange(type, EnumClimatiserTypes.TEMPERATURE)) { - if (position.getTemperature() < controlTemp) { - if (canChange(mode, EnumClimatiserModes.POSITIVE)) { - position.addTemperature(Math.min(change, controlTemp - position.getTemperature())); - hasChange = true; - } - } else if (position.getTemperature() > controlTemp) { - if (canChange(mode, EnumClimatiserModes.NEGATIVE)) { - position.addTemperature(-Math.min(position.getTemperature() - controlTemp, change)); - hasChange = true; - } + float change = maxChange; + if (distance > 0) { + change = (float) (maxChange / distance); + } + if (canChange(type, EnumClimatiserTypes.TEMPERATURE)) { + if (position.getTemperature() < controlTemp) { + if (canChange(mode, EnumClimatiserModes.POSITIVE)) { + position.addTemperature(Math.min(change, controlTemp - position.getTemperature())); + hasChange = true; + } + } else if (position.getTemperature() > controlTemp) { + if (canChange(mode, EnumClimatiserModes.NEGATIVE)) { + position.addTemperature(-Math.min(position.getTemperature() - controlTemp, change)); + hasChange = true; } } - if (canChange(type, EnumClimatiserTypes.HUMIDITY)) { - if (position.getHumidity() < controlHum) { - if (canChange(mode, EnumClimatiserModes.POSITIVE)) { - position.addHumidity(Math.min(change, controlHum - position.getHumidity())); - hasChange = true; - } - } else if (position.getHumidity() > controlHum) { - if (canChange(mode, EnumClimatiserModes.NEGATIVE)) { - position.addHumidity(-Math.min(position.getHumidity() - controlHum, change)); - hasChange = true; - } + } + if (canChange(type, EnumClimatiserTypes.HUMIDITY)) { + if (position.getHumidity() < controlHum) { + if (canChange(mode, EnumClimatiserModes.POSITIVE)) { + position.addHumidity(Math.min(change, controlHum - position.getHumidity())); + hasChange = true; + } + } else if (position.getHumidity() > controlHum) { + if (canChange(mode, EnumClimatiserModes.NEGATIVE)) { + position.addHumidity(-Math.min(position.getHumidity() - controlHum, change)); + hasChange = true; } } } @@ -117,6 +122,12 @@ public class GreenhouseClimateSource

extends } } } + if(!hasChange){ + currentCooldown = COOLDOWN; + if(isActive){ + isActive = false; + } + } if (provider.isActive() != isActive) { provider.setActive(isActive); } diff --git a/src/main/java/forestry/greenhouse/GreenhouseClimateWindow.java b/src/main/java/forestry/greenhouse/GreenhouseClimateWindow.java index ace8e4617..d447560e2 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseClimateWindow.java +++ b/src/main/java/forestry/greenhouse/GreenhouseClimateWindow.java @@ -59,39 +59,36 @@ public class GreenhouseClimateWindow extends GreenhouseClimateSource 0) { - change = (float) (maxChange / distance); - } - if (canChange(type, EnumClimatiserTypes.TEMPERATURE)) { - if (position.getTemperature() < controlTemp) { - if (canChange(mode, EnumClimatiserModes.POSITIVE)) { - position.addTemperature(Math.min(change, controlTemp - position.getTemperature())); - hasChange = true; - } - } else if (position.getTemperature() > controlTemp) { - if (canChange(mode, EnumClimatiserModes.NEGATIVE)) { - position.addTemperature(-Math.min(position.getTemperature() - controlTemp, change)); - hasChange = true; - } + float change = maxChange; + if (distance > 0) { + change = (float) (maxChange / distance); + } + if (canChange(type, EnumClimatiserTypes.TEMPERATURE)) { + if (position.getTemperature() < controlTemp) { + if (canChange(mode, EnumClimatiserModes.POSITIVE)) { + position.addTemperature(Math.min(change, controlTemp - position.getTemperature())); + hasChange = true; + } + } else if (position.getTemperature() > controlTemp) { + if (canChange(mode, EnumClimatiserModes.NEGATIVE)) { + position.addTemperature(-Math.min(position.getTemperature() - controlTemp, change)); + hasChange = true; } } - if (canChange(type, EnumClimatiserTypes.HUMIDITY)) { - if (position.getHumidity() < controlHum) { - if (canChange(mode, EnumClimatiserModes.POSITIVE)) { - position.addHumidity(Math.min(change, controlHum - position.getHumidity())); - hasChange = true; - } - } else if (position.getHumidity() > controlHum) { - if (canChange(mode, EnumClimatiserModes.NEGATIVE)) { - position.addHumidity(-Math.min(position.getHumidity() - controlHum, change)); - hasChange = true; - } + } + if (canChange(type, EnumClimatiserTypes.HUMIDITY)) { + if (position.getHumidity() < controlHum) { + if (canChange(mode, EnumClimatiserModes.POSITIVE)) { + position.addHumidity(Math.min(change, controlHum - position.getHumidity())); + hasChange = true; + } + } else if (position.getHumidity() > controlHum) { + if (canChange(mode, EnumClimatiserModes.NEGATIVE)) { + position.addHumidity(-Math.min(position.getHumidity() - controlHum, change)); + hasChange = true; } } } diff --git a/src/main/java/forestry/greenhouse/GreenhouseHelper.java b/src/main/java/forestry/greenhouse/GreenhouseHelper.java index 056d6efd6..60a9854ac 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseHelper.java +++ b/src/main/java/forestry/greenhouse/GreenhouseHelper.java @@ -23,7 +23,7 @@ import forestry.core.multiblock.MultiblockRegistry; import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; import forestry.greenhouse.multiblock.InternalBlockCheck; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.IBlockAccess; public class GreenhouseHelper implements IGreenhouseHelper { @@ -31,7 +31,7 @@ public class GreenhouseHelper implements IGreenhouseHelper { @Override @Nullable - public IGreenhouseController getGreenhouseController(World world, BlockPos pos) { + public IGreenhouseController getGreenhouseController(IBlockAccess world, BlockPos pos) { for (IMultiblockControllerInternal controllerInternal : MultiblockRegistry.getControllersFromWorld(world)) { if (controllerInternal instanceof IGreenhouseControllerInternal && controllerInternal.isAssembled() && diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/PluginGreenhouse.java index 55275d56b..969fd40f3 100644 --- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java +++ b/src/main/java/forestry/greenhouse/PluginGreenhouse.java @@ -36,7 +36,7 @@ import forestry.greenhouse.tiles.TileGreenhouseGearbox; import forestry.greenhouse.tiles.TileGreenhouseHatch; import forestry.greenhouse.tiles.TileGreenhouseHeater; import forestry.greenhouse.tiles.TileGreenhousePlain; -import forestry.greenhouse.tiles.TileGreenhouseSprinkler; +import forestry.greenhouse.tiles.TileGreenhouseHumidifier; import forestry.greenhouse.tiles.TileGreenhouseValve; import forestry.greenhouse.tiles.TileGreenhouseWindow; import forestry.plugins.BlankForestryPlugin; @@ -149,7 +149,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { '#', OreDictUtil.INGOT_IRON, 'T', coreItems.tubes.get(EnumElectronTube.TIN, 1)); - Block greenhouseDryerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DRYER); + Block greenhouseDryerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.DEHUMIDIFIER); RecipeUtil.addRecipe(greenhouseDryerBlock, "T#T", "#X#", @@ -158,7 +158,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { '#', OreDictUtil.INGOT_TIN, 'T', coreItems.tubes.get(EnumElectronTube.BLAZE, 1)); - Block greenhouseSprinklerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HUMUDIFIER); + Block greenhouseSprinklerBlock = blocks.getGreenhouseBlock(BlockGreenhouseType.HUMIDIFIER); RecipeUtil.addRecipe(greenhouseSprinklerBlock, "TXT", "GIG", @@ -229,7 +229,7 @@ public class PluginGreenhouse extends BlankForestryPlugin { GameRegistry.registerTileEntity(TileGreenhouseFan.class, "forestry.GreenhouseFan"); GameRegistry.registerTileEntity(TileGreenhouseHeater.class, "forestry.GreenhouseHeater"); GameRegistry.registerTileEntity(TileGreenhouseDryer.class, "forestry.GreenhouseDryer"); - GameRegistry.registerTileEntity(TileGreenhouseSprinkler.class, "forestry.GreenhouseSprinkler"); + GameRegistry.registerTileEntity(TileGreenhouseHumidifier.class, "forestry.GreenhouseSprinkler"); GameRegistry.registerTileEntity(TileGreenhouseValve.class, "forestry.GreenhouseValve"); GameRegistry.registerTileEntity(TileGreenhouseGearbox.class, "forestry.GreenhouseGearbox"); GameRegistry.registerTileEntity(TileGreenhouseControl.class, "forestry.GreenhouseController"); diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java index 0ff2b6923..13eb631f4 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java @@ -21,7 +21,6 @@ import forestry.api.core.IModelManager; import forestry.api.core.ISpriteRegister; import forestry.api.core.ITextureManager; import forestry.api.core.Tabs; -import forestry.api.multiblock.IGreenhouseComponent; import forestry.api.multiblock.IMultiblockController; import forestry.core.CreativeTabForestry; import forestry.core.blocks.BlockStructure; @@ -44,7 +43,7 @@ import forestry.greenhouse.tiles.TileGreenhouseGearbox; import forestry.greenhouse.tiles.TileGreenhouseHatch; import forestry.greenhouse.tiles.TileGreenhouseHeater; import forestry.greenhouse.tiles.TileGreenhousePlain; -import forestry.greenhouse.tiles.TileGreenhouseSprinkler; +import forestry.greenhouse.tiles.TileGreenhouseHumidifier; import forestry.greenhouse.tiles.TileGreenhouseValve; import forestry.greenhouse.tiles.TileGreenhouseWindow; import forestry.greenhouse.tiles.TileGreenhouseWindow.WindowMode; @@ -81,7 +80,6 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.common.property.Properties; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -302,8 +300,10 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR switch (type) { case GEARBOX: return new TileGreenhouseGearbox(); - case DRYER: + case DEHUMIDIFIER: return new TileGreenhouseDryer(); + case HUMIDIFIER: + return new TileGreenhouseHumidifier(); case VALVE: return new TileGreenhouseValve(); case FAN: diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java index d0a9c6faf..62afe2995 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java @@ -8,8 +8,6 @@ import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import forestry.greenhouse.blocks.BlockGreenhouse.State; import forestry.greenhouse.tiles.TileGreenhouseHatch; -import net.minecraft.block.BlockFurnace; -import net.minecraft.block.BlockStone; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -26,19 +24,24 @@ import net.minecraftforge.fml.relauncher.SideOnly; public enum BlockGreenhouseType { PLAIN, GLASS(Material.GLASS), + //item, energy / fluid HATCH_INPUT(true), HATCH_OUTPUT(true), + //energy GEARBOX(true), + //water VALVE(true), - FAN(true, true), - HEATER(true, true), - DRYER(true, true), + //temperature + HEATER(true, true), FAN(true, true), + //humidity + HUMIDIFIER(true, true), DEHUMIDIFIER(true, true), + //temperature and humidity + WINDOW(Material.GLASS, false, true), + //temperature and humidity + WINDOW_UP(Material.GLASS, false, true), CONTROL(true), - HUMUDIFIER(true, true), //humidifier DOOR, CLIMATE_CONTROL(true), - WINDOW(Material.GLASS, false, true), - WINDOW_UP(Material.GLASS, false, true), BUTTERFLY_HATCH(true); public static final BlockGreenhouseType[] VALUES = values(); @@ -79,11 +82,11 @@ public enum BlockGreenhouseType { private enum BlockGreenhouseSprites { GEARS("gears"), VALVE("valve"), - FAN_OFF("fan.off"), FAN_ON("fan.on"), HEATER_OFF("heater.off"), HEATER_ON("heater.on"), - DRYER("dryer"), + FAN_OFF("fan.off"), FAN_ON("fan.on"), + HUMIDIFIER_OFF("humidifier.off"), HUMIDIFIER_ON("humidifier.on"), + DEHUMIDIFIER_OFF("dehumidifier.off"), DEHUMIDIFIER_ON("dehumidifier.on"), CONTROL("control"), - HUMUDIFIER_OFF("humidifier.on"), HUMUDIFIER_ON("humidifier.on"), HATCH_DEFAULT("hatch"), HATCH_INPUT("hatch_input"), HATCH_OUTPUT("hatch_output"), CLIMATE_CONTROL("climate_control"), BUTTERFLY_HATCH("butterfly_hatch"); @@ -128,20 +131,30 @@ public enum BlockGreenhouseType { return sprites.get(BlockGreenhouseSprites.GEARS); case VALVE: return sprites.get(BlockGreenhouseSprites.VALVE); - case FAN: - if (state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) { - return sprites.get(BlockGreenhouseSprites.FAN_OFF); - } else { - return sprites.get(BlockGreenhouseSprites.FAN_ON); - } case HEATER: if (state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) { return sprites.get(BlockGreenhouseSprites.HEATER_OFF); } else { return sprites.get(BlockGreenhouseSprites.HEATER_ON); } - case DRYER: - return sprites.get(BlockGreenhouseSprites.DRYER); + case FAN: + if (state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) { + return sprites.get(BlockGreenhouseSprites.FAN_OFF); + } else { + return sprites.get(BlockGreenhouseSprites.FAN_ON); + } + case HUMIDIFIER: + if (state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) { + return sprites.get(BlockGreenhouseSprites.HUMIDIFIER_OFF); + } else { + return sprites.get(BlockGreenhouseSprites.HUMIDIFIER_ON); + } + case DEHUMIDIFIER: + if (state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) { + return sprites.get(BlockGreenhouseSprites.DEHUMIDIFIER_OFF); + } else { + return sprites.get(BlockGreenhouseSprites.DEHUMIDIFIER_ON); + } case CONTROL: return sprites.get(BlockGreenhouseSprites.CONTROL); case HATCH_OUTPUT: diff --git a/src/main/java/forestry/greenhouse/items/ItemBlockGreenhouseDoor.java b/src/main/java/forestry/greenhouse/items/ItemBlockGreenhouseDoor.java index 40613d0e3..9fde96b0a 100644 --- a/src/main/java/forestry/greenhouse/items/ItemBlockGreenhouseDoor.java +++ b/src/main/java/forestry/greenhouse/items/ItemBlockGreenhouseDoor.java @@ -49,7 +49,7 @@ public class ItemBlockGreenhouseDoor extends ItemBlockForestry 0 && hitZ > 0.5F || j < 0 && hitX > 0.5F || j > 0 && hitX < 0.5F; diff --git a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java index 7d2bf8420..913df4268 100644 --- a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java +++ b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java @@ -23,7 +23,6 @@ import forestry.core.models.ModelBlockDefault; import forestry.core.utils.CamouflageUtil; import forestry.greenhouse.blocks.BlockGreenhouse; import forestry.greenhouse.blocks.BlockGreenhouseType; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java index 71f750ece..9e7be49e9 100644 --- a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java @@ -101,10 +101,6 @@ public class FakeGreenhouseController extends FakeMultiblockController implement return null; } - @Override - public void clearRegion() { - } - @Override public Set getListenerComponents() { return Collections.emptySet(); diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 95a1b7418..705c91acb 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -14,10 +14,9 @@ import javax.annotation.Nullable; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; -import java.util.HashMap; +import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.Stack; @@ -45,7 +44,7 @@ import forestry.api.multiblock.IGreenhouseComponent.Climatiser; import forestry.api.multiblock.IGreenhouseController; import forestry.api.multiblock.IMultiblockComponent; import forestry.core.climate.ClimatePosition; -import forestry.core.climate.ClimateRoom; +import forestry.core.climate.ClimateRegion; import forestry.core.config.Constants; import forestry.core.fluids.FilteredTank; import forestry.core.fluids.StandardTank; @@ -65,10 +64,8 @@ import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.Translator; import forestry.energy.EnergyManager; -import forestry.greenhouse.blocks.BlockGreenhouse; -import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.inventory.InventoryGreenhouse; -import forestry.greenhouse.tiles.TileGreenhouseSprinkler; +import forestry.greenhouse.tiles.TileGreenhouseHumidifier; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -101,8 +98,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im private ItemStack camouflagePlainBlock; private ItemStack camouflageGlassBlock; private ItemStack camouflageDoorBlock; - @Nullable - private ClimateRoom region; + private ClimateRegion region; public GreenhouseController(World world) { super(world, GreenhouseMultiblockSizeLimits.instance); @@ -115,6 +111,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im camouflagePlainBlock = getDefaultCamouflageBlock(CamouflageManager.DEFAULT); camouflageGlassBlock = getDefaultCamouflageBlock(CamouflageManager.GLASS); camouflageDoorBlock = getDefaultCamouflageBlock(CamouflageManager.DOOR); + this.region = new ClimateRegion(this); } /* CLIMATE */ @@ -130,18 +127,12 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im @Override public float getExactTemperature() { - if (region == null) { - return 0; - } - return region.getTemperature(); + return region.getAverageTemperature(); } @Override public float getExactHumidity() { - if (region == null) { - return 0; - } - return region.getHumidity(); + return region.getAverageHumidity(); } @Override @@ -173,9 +164,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im data.setTag("logic" + logic.getName(), nbtTag); } - if (region != null) { - data.setTag("Region", region.writeToNBT(new NBTTagCompound())); - } + data.setTag("Region", region.writeToNBT(new NBTTagCompound())); return data; } @@ -204,8 +193,6 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im NBTTagCompound nbtTag = data.getCompoundTag("Region"); if (region != null) { region.readFromNBT(nbtTag); - } else { - region = new ClimateRoom(this, getWallPositions(), nbtTag); } } } @@ -234,12 +221,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im CamouflageUtil.writeCamouflageBlockToData(data, this, CamouflageManager.DEFAULT); CamouflageUtil.writeCamouflageBlockToData(data, this, CamouflageManager.GLASS); CamouflageUtil.writeCamouflageBlockToData(data, this, CamouflageManager.DOOR); - if (region != null) { - data.writeBoolean(true); - region.writeData(data); - } else { - data.writeBoolean(false); - } + region.writeData(data); } @Override @@ -250,9 +232,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im CamouflageUtil.readCamouflageBlockFromData(data, this); CamouflageUtil.readCamouflageBlockFromData(data, this); CamouflageUtil.readCamouflageBlockFromData(data, this); - if (data.readBoolean()) { - region.readData(data); - } + region.readData(data); } @Override @@ -384,6 +364,21 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im return FakeInventoryAdapter.instance(); } } + + private void addNewPositions(Collection newPositions){ + for (IClimatePosition position : newPositions) { + BlockPos pos = position.getPos(); + IClimatePosition oldPosition = region.getPosition(pos); + float temperature = position.getTemperature(); + float humidity = position.getHumidity(); + if (oldPosition != null) { + temperature = oldPosition.getTemperature(); + humidity = oldPosition.getHumidity(); + } + region.setPosition(pos, temperature, humidity); + } + region.calculateAverageClimate(); + } /* CONTROLLER */ @Override @@ -391,29 +386,17 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im super.onMachineAssembled(); createLogics(); - if (region != null) { - Map internalPositions = new HashMap<>(); - for (IInternalBlock block : internalBlocks) { - if (block != null) { - internalPositions.put(block.getPos(), new ClimatePosition(region, block.getPos())); - } + Set internalPositions = new HashSet<>(); + for (IInternalBlock block : internalBlocks) { + if (block != null) { + internalPositions.add(new ClimatePosition(region, block.getPos())); } - ForestryAPI.climateManager.removeRegion(region); - region = new ClimateRoom(region, internalPositions, getWallPositions()); - ForestryAPI.climateManager.addRegion(region); - } else { - Map internalPositions = new HashMap<>(); - region = new ClimateRoom(this, internalPositions, getWallPositions()); - for (IInternalBlock block : internalBlocks) { - if (block != null) { - internalPositions.put(block.getPos(), new ClimatePosition(region, block.getPos())); - } - } - ForestryAPI.climateManager.addRegion(region); } + addNewPositions(internalPositions); + ForestryAPI.climateManager.addRegion(region); for (IClimateSourceProvider source : climatiserComponents) { - ForestryAPI.climateManager.addSource(source); + region.addSource(source.getClimateSource()); } for (IMultiblockComponent comp : connectedParts) { @@ -429,9 +412,11 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im internalBlocks.clear(); logics.clear(); + + ForestryAPI.climateManager.removeRegion(region); for (IClimateSourceProvider source : climatiserComponents) { - ForestryAPI.climateManager.removeSource(source); + region.removeSource(source.getClimateSource()); } for (IMultiblockComponent comp : connectedParts) { @@ -467,18 +452,12 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im @Override protected void onAssimilate(IMultiblockControllerInternal assimilated) { IGreenhouseControllerInternal internal = (IGreenhouseControllerInternal) assimilated; - if (internal.getRegion() != null) { - if (region != null) { - ForestryAPI.climateManager.removeRegion(region); - region = new ClimateRoom(region, internal.getRegion().getPositions(), getWallPositions()); - ForestryAPI.climateManager.addRegion(region); - } - } + addNewPositions(internal.getRegion().getPositions()); } @Override public void onAssimilated(IMultiblockControllerInternal assimilator) { - if (region != null) { + if(isAssembled()){ ForestryAPI.climateManager.removeRegion(region); } } @@ -705,7 +684,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im if (tileFace instanceof IGreenhouseComponent) { if (((IGreenhouseComponent) tileFace).getMultiblockLogic().getController() != this) { throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.error.not.connected.part")); - } else if (!(tileFace instanceof TileGreenhouseSprinkler)) { + } else if (!(tileFace instanceof TileGreenhouseHumidifier)) { faceToCheck.setTested(true); } } else { @@ -770,11 +749,6 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im return region; } - @Override - public void clearRegion() { - region = null; - } - @Override public Set getListenerComponents() { return listenerComponents; @@ -789,14 +763,4 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im return canWork; } - protected List getWallPositions() { - List wallPositions = new ArrayList<>(); - for (IMultiblockComponent comp : connectedParts) { - if (comp != null) { - wallPositions.add(comp.getCoordinates()); - } - } - return wallPositions; - } - } diff --git a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java index c083a114e..62b951489 100644 --- a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java +++ b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java @@ -35,7 +35,6 @@ public interface IGreenhouseControllerInternal extends IGreenhouseController, IM */ ITankManager getTankManager(); - /** * @return The energy manager of the controller. */ @@ -47,14 +46,18 @@ public interface IGreenhouseControllerInternal extends IGreenhouseController, IM Set getInternalBlocks(); /** - * Set the region to null. + * @return True if the greenhouse can work. */ - void clearRegion(); - boolean canWork(); + /** + * @return A Set with listener componets. + */ Set getListenerComponents(); + /** + * @return A butterfly hatch, if one exists. + */ @Nullable IGreenhouseComponent.ButterflyHatch getButterflyHatch(); } diff --git a/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java b/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java index 7419000f7..3ab02462c 100644 --- a/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java +++ b/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java @@ -66,7 +66,7 @@ public class InternalBlock implements IInternalBlock { return false; } IInternalBlock internalBlock = (IInternalBlock) obj; - return internalBlock.getPos().equals(getPos()); + return getPos().equals(internalBlock.getPos()); } @Override diff --git a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java index f77c268cf..a0ae67166 100644 --- a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java +++ b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java @@ -18,12 +18,9 @@ import forestry.greenhouse.PluginGreenhouse; import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.blocks.BlockRegistryGreenhouse; import forestry.greenhouse.models.ModelGreenhouse; -import forestry.greenhouse.tiles.TileGreenhouseSprinkler; import forestry.plugins.ForestryPluginUids; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraftforge.client.model.animation.AnimationTESR; -import net.minecraftforge.fml.client.registry.ClientRegistry; public class ProxyGreenhouseClient extends ProxyGreenhouse { diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java index 9db3db6b6..1829495f3 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java @@ -10,8 +10,9 @@ ******************************************************************************/ package forestry.greenhouse.tiles; -import javax.annotation.Nullable; -import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; import forestry.api.climate.IClimateSource; import forestry.api.climate.IClimatiserDefinition; @@ -26,7 +27,6 @@ import forestry.energy.EnergyManager; import forestry.greenhouse.GreenhouseClimateSource; import forestry.greenhouse.multiblock.MultiblockLogicGreenhouse; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivatable, IGreenhouseComponent.Climatiser { @@ -37,14 +37,7 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat private final IClimatiserDefinition definition; private final ClimateSource source; - @Nullable - protected EnumFacing inwards; - @Nullable - protected EnumFacing leftwards; - @Nullable - protected BlockPos maxPos; - @Nullable - protected BlockPos minPos; + protected final Set positionsInRange; private boolean active; @@ -56,6 +49,7 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat this.definition = definition; this.source = source; this.source.setProvider(this); + this.positionsInRange = new HashSet(); } protected TileGreenhouseClimatiser(IClimatiserDefinition definition) { @@ -64,26 +58,19 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat @Override public void onMachineBroken() { - inwards = null; - leftwards = null; - - minPos = null; - maxPos = null; + positionsInRange.clear(); } @Override public void onMachineAssembled(IMultiblockController multiblockController, BlockPos minCoord, BlockPos maxCoord) { - recalculateDirections(minCoord, maxCoord); - int range = Math.round((float) definition.getRange() / 2); + positionsInRange.clear(); + float range = definition.getRange(); - if (inwards != null) { - if (leftwards != null) { - maxPos = getCoordinates().offset(inwards, range).offset(leftwards, range).offset(EnumFacing.UP, range); - minPos = getCoordinates().offset(inwards).offset(leftwards.getOpposite(), range).offset(EnumFacing.DOWN, range); - - } else { - maxPos = getCoordinates().offset(inwards, range).offset(EnumFacing.EAST, range).offset(EnumFacing.NORTH, range); - minPos = getCoordinates().offset(inwards).offset(EnumFacing.WEST, range).offset(EnumFacing.SOUTH, range); + Iterator positions = BlockPos.getAllInBox(pos.add(-range, -range, -range), pos.add(range, range, range)).iterator(); + while(positions.hasNext()){ + BlockPos pos = positions.next(); + if(pos.distanceSq(this.pos) <= range){ + positionsInRange.add(pos); } } } @@ -107,43 +94,6 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat return active; } - public void recalculateDirections(BlockPos minCoord, BlockPos maxCoord) { - inwards = null; - leftwards = null; - - int facesMatching = 0; - if (maxCoord.getX() == getCoordinates().getX() || minCoord.getX() == getCoordinates().getX()) { - facesMatching++; - } - if (maxCoord.getY() == getCoordinates().getY() || minCoord.getY() == getCoordinates().getY()) { - facesMatching++; - } - if (maxCoord.getZ() == getCoordinates().getZ() || minCoord.getZ() == getCoordinates().getZ()) { - facesMatching++; - } - if (facesMatching == 1) { - if (maxCoord.getX() == getCoordinates().getX()) { - inwards = EnumFacing.WEST; - leftwards = EnumFacing.SOUTH; - } else if (minCoord.getX() == getCoordinates().getX()) { - inwards = EnumFacing.EAST; - leftwards = EnumFacing.NORTH; - } else if (maxCoord.getZ() == getCoordinates().getZ()) { - inwards = EnumFacing.NORTH; - leftwards = EnumFacing.WEST; - } else if (minCoord.getZ() == getCoordinates().getZ()) { - inwards = EnumFacing.SOUTH; - leftwards = EnumFacing.EAST; - } else if (maxCoord.getY() == getCoordinates().getY()) { - inwards = EnumFacing.DOWN; - } else { - inwards = EnumFacing.UP; - } - } else { - inwards = EnumFacing.DOWN; - } - } - @Override public IClimatiserDefinition getDefinition() { return definition; @@ -165,11 +115,9 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat return EnergyHelper.consumeEnergyToDoWork(energyManager, WORK_CYCLES, ENERGY_PER_OPERATION); } - public Iterable getPositionsInRange() { - if (maxPos == null || minPos == null) { - return Collections.emptyList(); - } - return BlockPos.getAllInBox(maxPos, minPos); + @Override + public Set getPositionsInRange() { + return positionsInRange; } @Override diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseDryer.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseDryer.java index 7b2753c6e..45926a445 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseDryer.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseDryer.java @@ -17,7 +17,7 @@ import forestry.core.climate.ClimatiserDefinition; public class TileGreenhouseDryer extends TileGreenhouseClimatiser { - private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.015F, EnumClimatiserModes.NEGATIVE, 5D, EnumClimatiserTypes.HUMIDITY); + private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.015F, EnumClimatiserModes.NEGATIVE, 5F, EnumClimatiserTypes.HUMIDITY); public TileGreenhouseDryer() { super(DEFINITION); diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseFan.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseFan.java index 5a0d83fc7..659e4c1d0 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseFan.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseFan.java @@ -17,7 +17,7 @@ import forestry.core.climate.ClimatiserDefinition; public class TileGreenhouseFan extends TileGreenhouseClimatiser { - private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.015F, EnumClimatiserModes.NEGATIVE, 5D, EnumClimatiserTypes.TEMPERATURE); + private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.015F, EnumClimatiserModes.NEGATIVE, 5F, EnumClimatiserTypes.TEMPERATURE); public TileGreenhouseFan() { super(DEFINITION); diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHeater.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHeater.java index a8cd8f6de..1e4cab4df 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHeater.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHeater.java @@ -17,7 +17,7 @@ import forestry.core.climate.ClimatiserDefinition; public class TileGreenhouseHeater extends TileGreenhouseClimatiser { - private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.015F, EnumClimatiserModes.POSITIVE, 5D, EnumClimatiserTypes.TEMPERATURE); + private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.015F, EnumClimatiserModes.POSITIVE, 5F, EnumClimatiserTypes.TEMPERATURE); public TileGreenhouseHeater() { super(DEFINITION); diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHumidifier.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHumidifier.java new file mode 100644 index 000000000..be901ba44 --- /dev/null +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHumidifier.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.greenhouse.tiles; + +import forestry.api.climate.EnumClimatiserModes; +import forestry.api.climate.EnumClimatiserTypes; +import forestry.api.climate.IClimatiserDefinition; +import forestry.core.climate.ClimatiserDefinition; + +public class TileGreenhouseHumidifier extends TileGreenhouseClimatiser { + + private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.015F, EnumClimatiserModes.POSITIVE, 5F, EnumClimatiserTypes.HUMIDITY); + + public TileGreenhouseHumidifier() { + super(DEFINITION); + } + +} diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java deleted file mode 100644 index c3a360543..000000000 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java +++ /dev/null @@ -1,105 +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.greenhouse.tiles; - -import javax.annotation.Nullable; - -import com.google.common.collect.ImmutableMap; -import forestry.api.climate.EnumClimatiserModes; -import forestry.api.climate.EnumClimatiserTypes; -import forestry.api.climate.IClimatiserDefinition; -import forestry.api.multiblock.IMultiblockLogic; -import forestry.core.climate.ClimatiserDefinition; -import forestry.core.config.Constants; -import forestry.core.proxy.Proxies; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.common.animation.TimeValues; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.model.animation.CapabilityAnimation; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; - -public class TileGreenhouseSprinkler extends TileGreenhouseClimatiser { - - private final IAnimationStateMachine asm; - private final TimeValues.VariableValue clickTime = new TimeValues.VariableValue(Float.NEGATIVE_INFINITY); - - protected static final int WATER_PER_OPERATION = 25; - private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.005F, EnumClimatiserModes.POSITIVE, 9, EnumClimatiserTypes.HUMIDITY); - - public TileGreenhouseSprinkler() { - super(DEFINITION, 20 + WATER_PER_OPERATION / 10); - asm = Proxies.render.loadAnimationState(new ResourceLocation(Constants.MOD_ID, "asms/block/sprinkler.json"), ImmutableMap.of( - "cycle_length", new TimeValues.VariableValue(20), - "click_time", clickTime - )); - } - - @Override - public boolean hasFastRenderer() { - return true; - } - - @Override - public boolean canWork() { - IMultiblockLogic logic = getMultiblockLogic(); - if (!logic.isConnected()) { - return false; - } - return consumeWaterToDoWork(WORK_CYCLES, WATER_PER_OPERATION, getMultiblockLogic().getController().getTankManager().getTank(0)); - } - - @Override - public void setActive(boolean active) { - super.setActive(active); - if (world != null && world.isRemote) { - if (asm.currentState().equals("moving") && !isActive()) { - clickTime.setValue(Animation.getWorldTime(getWorld(), Animation.getPartialTickTime())); - asm.transition("stopping"); - } else if (asm.currentState().equals("default") && isActive()) { - float time = Animation.getWorldTime(getWorld(), Animation.getPartialTickTime()); - clickTime.setValue(time); - asm.transition("starting"); - } - } - } - - public boolean consumeWaterToDoWork(int ticksPerWorkCycle, int fluidPerWorkCycle, IFluidTank tank) { - int fluidPerCycle = (int) Math.ceil(fluidPerWorkCycle / (float) ticksPerWorkCycle); - if (tank.getFluid() == null || tank.getFluid().amount < fluidPerCycle) { - return false; - } - FluidStack drained = tank.drain(fluidPerCycle, true); - - return drained != null && drained.amount > 0; - } - - @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing side) { - if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { - return true; - } - return super.hasCapability(capability, side); - } - - @Override - @Nullable - public T getCapability(Capability capability, @Nullable EnumFacing side) { - if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { - return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); - } - return super.getCapability(capability, side); - } - -} diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseWindow.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseWindow.java index f2432ec8f..3209746bc 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseWindow.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseWindow.java @@ -14,6 +14,7 @@ import javax.annotation.Nullable; import forestry.api.climate.EnumClimatiserModes; import forestry.api.climate.EnumClimatiserTypes; +import forestry.api.climate.IClimatiserDefinition; import forestry.core.climate.ClimatiserDefinition; import forestry.greenhouse.GreenhouseClimateWindow; import forestry.greenhouse.PluginGreenhouse; @@ -27,9 +28,10 @@ import net.minecraft.util.math.BlockPos; public class TileGreenhouseWindow extends TileGreenhouseClimatiser { @Nullable private WindowMode mode; + private static final IClimatiserDefinition DEFINITION = new ClimatiserDefinition(0.001F, EnumClimatiserModes.NONE, 5F, EnumClimatiserTypes.NONE); public TileGreenhouseWindow() { - super(new ClimatiserDefinition(0.001F, EnumClimatiserModes.NONE, 5D, EnumClimatiserTypes.NONE), new GreenhouseClimateWindow(20)); + super(DEFINITION, new GreenhouseClimateWindow(20)); } public void onNeighborBlockChange() { diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java index 0fa221b38..f4480a0f1 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java @@ -13,8 +13,6 @@ package forestry.lepidopterology.genetics; import java.awt.Color; import java.util.Arrays; import java.util.Locale; -import java.util.regex.Pattern; - import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index b77cb0375..2e6dfaa31 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -13,8 +13,6 @@ package forestry.lepidopterology.genetics; import java.awt.Color; import java.util.Arrays; import java.util.Locale; -import java.util.regex.Pattern; - import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.api.lepidopterology.ButterflyManager; diff --git a/src/main/resources/assets/forestry/armatures/block/greenhouse.sprinkler_iron.json b/src/main/resources/assets/forestry/armatures/block/greenhouse.sprinkler_iron.json deleted file mode 100644 index 0237aeeb5..000000000 --- a/src/main/resources/assets/forestry/armatures/block/greenhouse.sprinkler_iron.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "joints": { - "sprinkler_iron": { "0": [ 1.0 ], "1": [ 1.0 ], "2": [ 1.0 ] } - }, - "clips": { - "default": { - "loop": false, - "joint_clips": {}, - "events": {} - }, - "moving": { - "loop": true, - "joint_clips": { - "sprinkler_iron": [ - { - "variable": "axis_y", - "type": "uniform", - "interpolation": "nearest", - "samples": [ 1 ] - }, - { - "variable": "angle", - "type": "uniform", - "interpolation": "linear", - "samples": [ - 0, 120, 240, - 0, 120, 240, - 0, 120, 240, - 0, 120, 240 - ] - } - ] - }, - "events": { - "0.5": "boop" - } - } - } -} - diff --git a/src/main/resources/assets/forestry/asms/block/sprinkler.json b/src/main/resources/assets/forestry/asms/block/sprinkler.json deleted file mode 100644 index f6ccd015d..000000000 --- a/src/main/resources/assets/forestry/asms/block/sprinkler.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "parameters": { - "world_to_cycle": [ "/", "#cycle_length" ], - "round_cycle": [ "compose", [ "R", "#cycle_length" ] , "#click_time" ], - "end_cycle": [ "-", "#round_cycle" ] - }, - "clips": { - "default": "forestry:block/greenhouse.sprinkler_iron@default", - "starting": [ "trigger_positive", "#default", "#end_cycle", "!transition:moving" ], - "moving": [ "apply", "forestry:block/greenhouse.sprinkler_iron@moving", "#world_to_cycle" ], - "stopping": [ "trigger_positive", "#moving", "#end_cycle", "!transition:default" ] - }, - "states": [ - "default", - "starting", - "moving", - "stopping" - ], - "transitions": { - "default": "starting", - "starting": "moving", - "moving": "stopping", - "stopping": "default" - }, - "start_state": "default" -} diff --git a/src/main/resources/assets/forestry/models/block/greenhouse.sprinkler_base.json b/src/main/resources/assets/forestry/models/block/greenhouse.sprinkler_base.json deleted file mode 100644 index 70cef0212..000000000 --- a/src/main/resources/assets/forestry/models/block/greenhouse.sprinkler_base.json +++ /dev/null @@ -1,20 +0,0 @@ -{ -"textures": { - "particle": "blocks/glass_green", - "glass": "blocks/glass_green" -}, -"elements": [ -{ - "from": [ 5, 10, 5 ], - "to": [ 11, 16, 11 ], - "faces": { - "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#glass" }, - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#glass" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#glass" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#glass" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#glass" }, - "east": { "uv": [ 0, 0, 15.5, 16 ], "texture": "#glass" } - } -} -] -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/greenhouse.sprinkler_iron.json b/src/main/resources/assets/forestry/models/block/greenhouse.sprinkler_iron.json deleted file mode 100644 index 412a673a8..000000000 --- a/src/main/resources/assets/forestry/models/block/greenhouse.sprinkler_iron.json +++ /dev/null @@ -1,43 +0,0 @@ -{ -"textures": { - "iron_base": "blocks/anvil_base" -}, -"elements": [ -{ - "from": [ 7, 4, 7 ], - "to": [ 9, 10, 9 ], - "faces": { - "down": { "uv": [ 9, 9, 7, 7 ], "texture": "#iron_base" }, - "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#iron_base" }, - "north": { "uv": [ 7, 6, 9, 12 ], "texture": "#iron_base" }, - "south": { "uv": [ 7, 6, 9, 12 ], "texture": "#iron_base" }, - "west": { "uv": [ 7, 6, 9, 12 ], "texture": "#iron_base" }, - "east": { "uv": [ 7, 6, 9, 12 ], "texture": "#iron_base" } - } -}, -{ - "from": [ 7.5, 5, 5.5 ], - "to": [ 8.5, 6, 10.5 ], - "faces": { - "down": { "uv": [ 8.5, 10.5, 7.5, 5.5 ], "texture": "#iron_base" }, - "up": { "uv": [ 7.5, 5.5, 8.5, 10.5 ], "texture": "#iron_base" }, - "north": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#iron_base" }, - "south": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#iron_base" }, - "west": { "uv": [ 5.5, 10, 10.5, 11 ], "texture": "#iron_base" }, - "east": { "uv": [ 5.5, 10, 10.5, 11 ], "texture": "#iron_base" } - } -}, -{ - "from": [ 5.5, 5, 7.5 ], - "to": [ 10.5, 6, 8.5 ], - "faces": { - "down": { "uv": [ 10.5, 8.5, 5.5, 7.5 ], "texture": "#iron_base" }, - "up": { "uv": [ 5.5, 7.5, 10.5, 8.5 ], "texture": "#iron_base" }, - "north": { "uv": [ 5.5, 10, 10.5, 11 ], "texture": "#iron_base" }, - "south": { "uv": [ 5.5, 10, 10.5, 11 ], "texture": "#iron_base" }, - "west": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#iron_base" }, - "east": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#iron_base" } - } -} -] -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/butterfly_hatch.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/butterfly_hatch.png index d5af45b95..370eea4a9 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/butterfly_hatch.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/butterfly_hatch.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/climate_control.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/climate_control.png index 3ebaad392..b3fbfd303 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/climate_control.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/climate_control.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/control.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/control.png index 37df85dbf..a36d11f62 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/control.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/control.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/dehumidifier.off.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/dehumidifier.off.png new file mode 100644 index 000000000..5eed87963 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/dehumidifier.off.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/dehumidifier.on.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/dehumidifier.on.png new file mode 100644 index 000000000..c479bfc0d Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/dehumidifier.on.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/dryer.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/dryer.png deleted file mode 100644 index e14829987..000000000 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/dryer.png and /dev/null differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.off.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.off.png index 5b3f51d09..09adf2d05 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.off.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.off.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.on.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.on.png index d5c163555..6231b2598 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.on.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/fan.on.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/gears.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/gears.png index 59bf36b01..b9e6e9f4b 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/gears.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/gears.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch.png index 120d27d5b..46a763288 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch_input.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch_input.png index 7cd6f9169..4b2b38b5c 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch_input.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch_input.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch_output.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch_output.png index ce537cda7..bba741577 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch_output.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/hatch_output.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.off.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.off.png index 5b2034610..da47174a9 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.off.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.off.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.on.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.on.png index a5b619c52..c5bb4ace6 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.on.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/heater.on.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/humidifier.off.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/humidifier.off.png new file mode 100644 index 000000000..65e4b67ee Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/humidifier.off.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/humidifier.on.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/humidifier.on.png new file mode 100644 index 000000000..c8dea7567 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/humidifier.on.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/greenhouse/valve.png b/src/main/resources/assets/forestry/textures/blocks/greenhouse/valve.png index 39d88861b..391e293cb 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/greenhouse/valve.png and b/src/main/resources/assets/forestry/textures/blocks/greenhouse/valve.png differ