From ae025a92fccd23b0c3dc53f45a52d0f741b5c148 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Wed, 8 Jun 2016 21:58:10 +0200 Subject: [PATCH] Clean Up, Work on climate system --- src/main/java/forestry/Forestry.java | 16 -- .../api/core/climate/IClimateManager.java | 1 - .../api/core/climate/IClimateMap.java | 27 ---- .../api/core/climate/IClimateWorld.java | 2 - .../api/core/climate/IClimatedPosition.java | 3 - .../api/greenhouse/IGreenhouseState.java | 3 - .../api/greenhouse/IInternalBlock.java | 3 - .../api/multiblock/IGreenhouseComponent.java | 2 - .../api/multiblock/IGreenhouseController.java | 2 - .../worldgen/VillageApiaristHouse.java | 12 +- .../arboriculture/PluginArboriculture.java | 1 - .../arboriculture/blocks/BlockPile.java | 1 - .../arboriculture/items/ItemCharcoal.java | 3 - .../forestry/core/blocks/BlockRegistry.java | 3 - .../core/blocks/BlockResourceOre.java | 1 - .../core/climate/ClimateEventHandler.java | 5 - .../forestry/core/climate/ClimateManager.java | 4 - .../forestry/core/climate/ClimateMap.java | 87 ---------- .../forestry/core/climate/ClimateWorld.java | 8 +- .../core/climate/ClimatedPosition.java | 2 - .../core/climate/IClimateHandler.java | 1 - .../forestry/core/fluids/TankManager.java | 1 + .../java/forestry/core/proxy/ProxyRender.java | 1 - .../java/forestry/core/utils/OreDictUtil.java | 7 - .../forestry/greenhouse/GreenhouseState.java | 1 - .../multiblock/GreenhouseController.java | 57 +++++-- .../greenhouse/multiblock/InternalBlock.java | 4 - .../tiles/TileGreenhouseClimatiser.java | 153 ++++++++++++++++-- .../plugins/compat/PluginBiomesOPlenty.java | 4 - .../java/forestry/storage/CrateRegistry.java | 1 - 30 files changed, 198 insertions(+), 218 deletions(-) delete mode 100644 src/main/java/forestry/api/core/climate/IClimateMap.java delete mode 100644 src/main/java/forestry/core/climate/ClimateMap.java diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 764c30268..6800a00f8 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -11,12 +11,6 @@ package forestry; import java.io.File; -import java.util.List; - -import com.google.common.collect.Lists; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; @@ -81,16 +75,6 @@ public class Forestry { @EventHandler public void preInit(FMLPreInitializationEvent event) { - List POS = Lists.newArrayList(); - List POS2 = Lists.newArrayList(); - for(BlockPos pos : BlockPos.getAllInBox(new BlockPos(0, 10, 0), new BlockPos(20, 10, 20))){ - double p = pos.getDistance(10, 10, 10); - if(p <= 2){ - POS.add(pos); - } - POS2.add(pos); - } - packetHandler = new PacketHandler(); // Register event handler diff --git a/src/main/java/forestry/api/core/climate/IClimateManager.java b/src/main/java/forestry/api/core/climate/IClimateManager.java index 9b99a7ef9..e9e1664ac 100644 --- a/src/main/java/forestry/api/core/climate/IClimateManager.java +++ b/src/main/java/forestry/api/core/climate/IClimateManager.java @@ -7,7 +7,6 @@ package forestry.api.core.climate; import java.util.Map; -import forestry.api.core.climate.IClimateWorld.ClimateChunk; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/forestry/api/core/climate/IClimateMap.java b/src/main/java/forestry/api/core/climate/IClimateMap.java deleted file mode 100644 index 5ea11e079..000000000 --- a/src/main/java/forestry/api/core/climate/IClimateMap.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright 2011-2014 SirSengir - * - * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. - ******************************************************************************/ -package forestry.api.core.climate; - -import java.util.List; -import java.util.Stack; - -import forestry.core.multiblock.RectangularMultiblockControllerBase; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public interface IClimateMap { - - List getPositions(); - - World getWorld(); - - BlockPos getMinimumPos(); - - BlockPos getMaximumPos(); - - void updateClimate(); - -} diff --git a/src/main/java/forestry/api/core/climate/IClimateWorld.java b/src/main/java/forestry/api/core/climate/IClimateWorld.java index c3c2196e6..a391719a8 100644 --- a/src/main/java/forestry/api/core/climate/IClimateWorld.java +++ b/src/main/java/forestry/api/core/climate/IClimateWorld.java @@ -6,8 +6,6 @@ import java.util.Map; import javax.annotation.Nonnull; -import forestry.api.core.ForestryAPI; -import forestry.api.core.climate.IClimateWorld.ClimateChunk; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; diff --git a/src/main/java/forestry/api/core/climate/IClimatedPosition.java b/src/main/java/forestry/api/core/climate/IClimatedPosition.java index 806ec954e..7300442fe 100644 --- a/src/main/java/forestry/api/core/climate/IClimatedPosition.java +++ b/src/main/java/forestry/api/core/climate/IClimatedPosition.java @@ -9,12 +9,9 @@ import java.util.List; import javax.annotation.Nonnull; -import com.google.common.collect.Lists; - import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import forestry.core.climate.IClimateHandler; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; public interface IClimatedPosition extends INbtReadable, INbtWritable { diff --git a/src/main/java/forestry/api/greenhouse/IGreenhouseState.java b/src/main/java/forestry/api/greenhouse/IGreenhouseState.java index df31629c3..773d0b798 100644 --- a/src/main/java/forestry/api/greenhouse/IGreenhouseState.java +++ b/src/main/java/forestry/api/greenhouse/IGreenhouseState.java @@ -9,12 +9,9 @@ import java.util.Collection; import java.util.Set; import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.multiblock.IMultiblockComponent; -import net.minecraft.util.math.BlockPos; public interface IGreenhouseState { diff --git a/src/main/java/forestry/api/greenhouse/IInternalBlock.java b/src/main/java/forestry/api/greenhouse/IInternalBlock.java index f326e0ca4..1adf10009 100644 --- a/src/main/java/forestry/api/greenhouse/IInternalBlock.java +++ b/src/main/java/forestry/api/greenhouse/IInternalBlock.java @@ -8,12 +8,9 @@ package forestry.api.greenhouse; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import forestry.api.core.EnumHumidity; - import java.util.Collection; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public interface IInternalBlock { diff --git a/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java b/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java index d3b451ed4..0466f00fc 100644 --- a/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java +++ b/src/main/java/forestry/api/multiblock/IGreenhouseComponent.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.multiblock; -import forestry.api.core.climate.IClimateControlled; -import forestry.api.greenhouse.IGreenhouseHousing; import forestry.api.greenhouse.IGreenhouseListener; import forestry.api.lepidopterology.IButterflyCocoon; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/api/multiblock/IGreenhouseController.java b/src/main/java/forestry/api/multiblock/IGreenhouseController.java index 8851d67bc..c89c3a56c 100644 --- a/src/main/java/forestry/api/multiblock/IGreenhouseController.java +++ b/src/main/java/forestry/api/multiblock/IGreenhouseController.java @@ -8,8 +8,6 @@ package forestry.api.multiblock; import java.util.List; import forestry.api.core.ICamouflageHandler; -import forestry.api.core.climate.IClimateControlled; -import forestry.api.core.climate.IClimateMap; import forestry.api.greenhouse.EnumGreenhouseEventType; import forestry.api.greenhouse.IGreenhouseHousing; import forestry.api.greenhouse.IGreenhouseLogic; diff --git a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java index 83f5bffe5..dc5985af3 100644 --- a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java @@ -18,6 +18,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDoor; import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockLog; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockStairs; @@ -59,6 +60,7 @@ import forestry.apiculture.tiles.TileBeeHouse; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.blocks.log.BlockArbLog; import forestry.core.PluginCore; +import forestry.core.blocks.BlockBase; import forestry.core.blocks.BlockCore; import forestry.core.config.Constants; import forestry.core.tiles.TileUtil; @@ -143,9 +145,9 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { fillWithBlocks(world, structBoundingBox, 8, 1, 6, 8, 1, 10, fence, fence, false); fillWithBlocks(world, structBoundingBox, 2, 1, 10, 7, 1, 10, fence, fence, false); - setBlockState(world, fenceGate.withProperty(BlockFenceGate.FACING, EnumFacing.EAST), 8, 1, 8, structBoundingBox); - setBlockState(world, fenceGate.withProperty(BlockFenceGate.FACING, EnumFacing.EAST), 1, 1, 8, structBoundingBox); - setBlockState(world, fenceGate.withProperty(BlockFenceGate.FACING, EnumFacing.NORTH), 4, 1, 10, structBoundingBox); + setBlockState(world, fenceGate.withProperty(BlockHorizontal.FACING, EnumFacing.EAST), 8, 1, 8, structBoundingBox); + setBlockState(world, fenceGate.withProperty(BlockHorizontal.FACING, EnumFacing.EAST), 1, 1, 8, structBoundingBox); + setBlockState(world, fenceGate.withProperty(BlockHorizontal.FACING, EnumFacing.NORTH), 4, 1, 10, structBoundingBox); // Flowers plantFlowerGarden(world, structBoundingBox, 2, 1, 5, 7, 1, 9); @@ -174,7 +176,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { IBlockState slabCeiling = slabs.withProperty(BlockSlab.HALF, BlockSlab.EnumBlockHalf.TOP); fillWithBlocks(world, structBoundingBox, 1, 4, 1, 7, 4, 4, slabCeiling, slabCeiling, false); - IBlockState logBracing = logs.withProperty(BlockArbLog.LOG_AXIS, BlockLog.EnumAxis.X); + IBlockState logBracing = logs.withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.X); fillWithBlocks(world, structBoundingBox, 0, 4, 1, 8, 4, 1, logBracing, logBracing, false); fillWithBlocks(world, structBoundingBox, 0, 4, 4, 8, 4, 4, logBracing, logBracing, false); @@ -222,7 +224,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { // Escritoire if (random.nextInt(2) == 0) { - IBlockState escritoireBlock = PluginCore.blocks.escritoire.getDefaultState().withProperty(BlockCore.FACING, EnumFacing.EAST); + IBlockState escritoireBlock = PluginCore.blocks.escritoire.getDefaultState().withProperty(BlockBase.FACING, EnumFacing.EAST); setBlockState(world, escritoireBlock, 1, 1, 3, structBoundingBox); } diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 03b2c2d01..cf0857248 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -71,7 +71,6 @@ import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.genetics.alleles.AlleleGrowth; import forestry.arboriculture.genetics.alleles.AlleleLeafEffect; import forestry.arboriculture.items.ItemCharcoal; -import forestry.arboriculture.items.ItemGermlingGE; import forestry.arboriculture.items.ItemRegistryArboriculture; import forestry.arboriculture.models.TextureLeaves; import forestry.arboriculture.network.PacketRegistryArboriculture; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockPile.java b/src/main/java/forestry/arboriculture/blocks/BlockPile.java index 87533b56c..da5357a1a 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockPile.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockPile.java @@ -47,7 +47,6 @@ import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumPileType; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; diff --git a/src/main/java/forestry/arboriculture/items/ItemCharcoal.java b/src/main/java/forestry/arboriculture/items/ItemCharcoal.java index 6176700eb..682e5746e 100644 --- a/src/main/java/forestry/arboriculture/items/ItemCharcoal.java +++ b/src/main/java/forestry/arboriculture/items/ItemCharcoal.java @@ -2,11 +2,8 @@ package forestry.arboriculture.items; import java.util.List; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.TreeManager; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; -import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.items.ItemForestry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/forestry/core/blocks/BlockRegistry.java b/src/main/java/forestry/core/blocks/BlockRegistry.java index 30c640fa4..989136a76 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistry.java +++ b/src/main/java/forestry/core/blocks/BlockRegistry.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.blocks; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -20,7 +18,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import forestry.core.proxy.Proxies; -import forestry.core.utils.OreDictUtil; import forestry.plugins.PluginManager; public abstract class BlockRegistry { diff --git a/src/main/java/forestry/core/blocks/BlockResourceOre.java b/src/main/java/forestry/core/blocks/BlockResourceOre.java index 9b91c1fbd..e324b2d7e 100644 --- a/src/main/java/forestry/core/blocks/BlockResourceOre.java +++ b/src/main/java/forestry/core/blocks/BlockResourceOre.java @@ -35,7 +35,6 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; import forestry.core.PluginCore; -import forestry.core.utils.OreDictUtil; public class BlockResourceOre extends Block implements IItemModelRegister, IBlockWithMeta { public static final PropertyEnum ORE_RESOURCES = PropertyEnum.create("resource", EnumResourceType.class, new Predicate(){ diff --git a/src/main/java/forestry/core/climate/ClimateEventHandler.java b/src/main/java/forestry/core/climate/ClimateEventHandler.java index 763db5b22..40c49bea2 100644 --- a/src/main/java/forestry/core/climate/ClimateEventHandler.java +++ b/src/main/java/forestry/core/climate/ClimateEventHandler.java @@ -1,12 +1,7 @@ package forestry.core.climate; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; - import forestry.api.core.ForestryAPI; import forestry.api.core.climate.IClimateWorld; import forestry.api.core.climate.IClimateWorld.ClimateChunk; diff --git a/src/main/java/forestry/core/climate/ClimateManager.java b/src/main/java/forestry/core/climate/ClimateManager.java index f98c16c21..4e0955de7 100644 --- a/src/main/java/forestry/core/climate/ClimateManager.java +++ b/src/main/java/forestry/core/climate/ClimateManager.java @@ -11,7 +11,6 @@ package forestry.core.climate; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -21,12 +20,9 @@ import java.util.concurrent.ConcurrentHashMap; import forestry.api.core.ForestryAPI; import forestry.api.core.climate.IClimateManager; import forestry.api.core.climate.IClimateWorld; -import forestry.api.core.climate.IClimateWorld.ClimateChunk; import forestry.api.greenhouse.GreenhouseManager; import forestry.api.greenhouse.IGreenhouseState; -import forestry.arboriculture.PluginArboriculture; import forestry.plugins.ForestryPluginUids; -import forestry.plugins.PluginManager; public class ClimateManager implements IClimateManager{ diff --git a/src/main/java/forestry/core/climate/ClimateMap.java b/src/main/java/forestry/core/climate/ClimateMap.java deleted file mode 100644 index cb4934a0f..000000000 --- a/src/main/java/forestry/core/climate/ClimateMap.java +++ /dev/null @@ -1,87 +0,0 @@ -package forestry.core.climate; - -import java.util.ArrayList; -import java.util.List; - -import forestry.api.core.climate.IClimateMap; -import forestry.api.core.climate.IClimatedPosition; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; - -public class ClimateMap implements IClimateMap { - - protected final List positions; - protected final World world; - protected final BlockPos minimumPos; - protected final BlockPos maximumPos; - - public ClimateMap(World world, BlockPos minimumPos, BlockPos maximumPos, List positions) { - this.world = world; - this.minimumPos = minimumPos; - this.maximumPos = maximumPos; - this.positions = positions; - } - - public ClimateMap(World world, BlockPos minimumPos, BlockPos maximumPos) { - this.world = world; - this.minimumPos = minimumPos; - this.maximumPos = maximumPos; - positions = new ArrayList(); - for(BlockPos pos : BlockPos.getAllInBox(minimumPos, maximumPos)){ - Biome biome = world.getBiome(pos); - positions.add(new ClimatedPosition(this, pos, biome.getTemperature(), biome.getRainfall())); - } - } - - @Override - public List getPositions() { - return positions; - } - - @Override - public World getWorld() { - return world; - } - - @Override - public BlockPos getMinimumPos() { - return minimumPos; - } - - @Override - public BlockPos getMaximumPos() { - return maximumPos; - } - - protected IClimatedPosition getPosition(BlockPos pos){ - for(IClimatedPosition climatedPosition : positions){ - if(climatedPosition.getPos().equals(pos)){ - return climatedPosition; - } - } - return null; - } - - @Override - public void updateClimate() { - for(IClimatedPosition position : positions) { - for(EnumFacing facing : EnumFacing.VALUES){ - BlockPos facePos = position.getPos().offset(facing); - IClimatedPosition climatedPosition = getPosition(facePos); - if(climatedPosition != null){ - if(position.getTemperature() > climatedPosition.getTemperature() + 0.01F){ - position.setTemperature(position.getTemperature() - 0.01F); - climatedPosition.setTemperature(climatedPosition.getTemperature() + 0.01F); - } - if(position.getHumidity() > climatedPosition.getHumidity() + 0.01F){ - position.setHumidity(position.getHumidity() - 0.01F); - climatedPosition.setHumidity(climatedPosition.getHumidity() + 0.01F); - } - } - } - } - } - -} diff --git a/src/main/java/forestry/core/climate/ClimateWorld.java b/src/main/java/forestry/core/climate/ClimateWorld.java index 2dfb67e47..f689e15c8 100644 --- a/src/main/java/forestry/core/climate/ClimateWorld.java +++ b/src/main/java/forestry/core/climate/ClimateWorld.java @@ -1,15 +1,12 @@ package forestry.core.climate; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import forestry.api.core.climate.IClimateWorld; import forestry.api.core.climate.IClimatedPosition; -import forestry.api.greenhouse.IInternalBlock; -import net.minecraft.block.state.BlockPistonStructureHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; @@ -22,6 +19,7 @@ public class ClimateWorld implements IClimateWorld{ protected Map climateChunks = new ConcurrentHashMap(); protected List dirtyClimateChunks = new ArrayList<>(); + @Override public void addPosition(BlockPos pos){ Biome biome = world.getBiome(pos); addPosition(new ClimatedPosition(this, pos, biome.getTemperature(), biome.getRainfall())); @@ -58,6 +56,10 @@ public class ClimateWorld implements IClimateWorld{ @Override public IClimatedPosition getPosition(BlockPos pos) { + ClimateChunk climateChunk = climateChunks.get(new ChunkPos(pos)); + if(climateChunk != null){ + return climateChunk.getClimates().get(pos); + } return null; } diff --git a/src/main/java/forestry/core/climate/ClimatedPosition.java b/src/main/java/forestry/core/climate/ClimatedPosition.java index ad68f8047..19c513b9a 100644 --- a/src/main/java/forestry/core/climate/ClimatedPosition.java +++ b/src/main/java/forestry/core/climate/ClimatedPosition.java @@ -15,12 +15,10 @@ import java.util.List; import javax.annotation.Nonnull; -import forestry.api.core.climate.IClimateMap; import forestry.api.core.climate.IClimateWorld; import forestry.api.core.climate.IClimatedPosition; import forestry.api.multiblock.IMultiblockComponent; import forestry.api.multiblock.IMultiblockLogic; -import forestry.core.tiles.TileEngine; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/forestry/core/climate/IClimateHandler.java b/src/main/java/forestry/core/climate/IClimateHandler.java index f9d6483e6..05a3722fb 100644 --- a/src/main/java/forestry/core/climate/IClimateHandler.java +++ b/src/main/java/forestry/core/climate/IClimateHandler.java @@ -1,6 +1,5 @@ package forestry.core.climate; -import forestry.api.core.climate.IClimateMap; import forestry.api.core.climate.IClimateWorld; import forestry.api.core.climate.IClimatedPosition; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index e4e71f905..795f921c6 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -275,6 +275,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl return tank.drain(maxDrain, doDrain); } + @Override public FluidStack drain(FluidStack resource, boolean doDrain) { for (StandardTank tank : tanks) { if (tankCanDrainFluid(tank, resource)) { diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index e11be2fb1..2eec17ddb 100644 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -23,7 +23,6 @@ import net.minecraft.client.resources.IResourceManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; import net.minecraftforge.common.animation.ITimeValue; diff --git a/src/main/java/forestry/core/utils/OreDictUtil.java b/src/main/java/forestry/core/utils/OreDictUtil.java index 114c0e5e0..73b0baaac 100644 --- a/src/main/java/forestry/core/utils/OreDictUtil.java +++ b/src/main/java/forestry/core/utils/OreDictUtil.java @@ -1,12 +1,5 @@ package forestry.core.utils; -import javax.annotation.Nullable; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import net.minecraftforge.oredict.OreDictionary; - public class OreDictUtil { public static final String ORE_COPPER = "oreCopper"; public static final String ORE_TIN = "oreTin"; diff --git a/src/main/java/forestry/greenhouse/GreenhouseState.java b/src/main/java/forestry/greenhouse/GreenhouseState.java index b87b19aae..9b481a77d 100644 --- a/src/main/java/forestry/greenhouse/GreenhouseState.java +++ b/src/main/java/forestry/greenhouse/GreenhouseState.java @@ -19,7 +19,6 @@ import forestry.api.greenhouse.IGreenhouseState; import forestry.api.greenhouse.IInternalBlock; import forestry.api.multiblock.IMultiblockComponent; import forestry.greenhouse.multiblock.GreenhouseController; -import net.minecraft.util.math.BlockPos; public final class GreenhouseState implements IGreenhouseState { diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index faf857be8..942134dbf 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -27,16 +27,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; - import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidRegistry; import forestry.api.core.EnumCamouflageType; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; import forestry.api.core.ICamouflagedTile; -import forestry.api.core.climate.IClimateMap; +import forestry.api.core.climate.IClimateWorld; import forestry.api.core.climate.IClimatedPosition; import forestry.api.greenhouse.EnumGreenhouseEventType; import forestry.api.greenhouse.GreenhouseEvents.CamouflageChangeEvent; @@ -52,8 +51,7 @@ import forestry.api.multiblock.IGreenhouseComponent.ButterflyHatch; import forestry.api.multiblock.IGreenhouseController; import forestry.api.multiblock.IMultiblockComponent; import forestry.core.access.EnumAccess; -import forestry.core.climate.ClimateMap; -import forestry.core.climate.ClimatedPosition; +import forestry.core.climate.ClimateWorld; import forestry.core.config.Constants; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; @@ -124,13 +122,42 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im @Override public float getExactTemperature() { - BlockPos coords = getReferenceCoord(); - return getBiome().getFloatTemperature(coords) + tempChange; + int dimensionID = worldObj.provider.getDimension(); + IClimateWorld climateWorld = ForestryAPI.climateManager.getClimateWorlds().get(Integer.valueOf(dimensionID)); + if(climateWorld == null){ + climateWorld = new ClimateWorld(); + ForestryAPI.climateManager.getClimateWorlds().put(Integer.valueOf(dimensionID), climateWorld); + } + + float temperature = 0.0F; + + for(IInternalBlock internalBlock : internalBlocks){ + IClimatedPosition position = climateWorld.getPosition(internalBlock.getPos()); + if(position != null){ + temperature+=position.getTemperature(); + } + } + return temperature / internalBlocks.size(); } @Override public float getExactHumidity() { - return getBiome().getRainfall() + humidChange; + int dimensionID = worldObj.provider.getDimension(); + IClimateWorld climateWorld = ForestryAPI.climateManager.getClimateWorlds().get(Integer.valueOf(dimensionID)); + if(climateWorld == null){ + climateWorld = new ClimateWorld(); + ForestryAPI.climateManager.getClimateWorlds().put(Integer.valueOf(dimensionID), climateWorld); + } + + float humidity = 0.0F; + + for(IInternalBlock internalBlock : internalBlocks){ + IClimatedPosition position = climateWorld.getPosition(internalBlock.getPos()); + if(position != null){ + humidity+=position.getHumidity(); + } + } + return humidity / internalBlocks.size(); } @Override @@ -372,7 +399,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im @Override public IInventoryAdapter getInternalInventory() { if (isAssembled()) { - return inventory;2 + return inventory; } else { return FakeInventoryAdapter.instance(); } @@ -384,6 +411,18 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im super.onMachineAssembled(); createLogics(); + int dimensionID = worldObj.provider.getDimension(); + IClimateWorld climateWorld = ForestryAPI.climateManager.getClimateWorlds().get(Integer.valueOf(dimensionID)); + if(climateWorld == null){ + climateWorld = new ClimateWorld(); + ForestryAPI.climateManager.getClimateWorlds().put(Integer.valueOf(dimensionID), climateWorld); + } + + for(IInternalBlock internalBlock : internalBlocks){ + if(climateWorld.getPosition(internalBlock.getPos()) != null){ + climateWorld.addPosition(internalBlock.getPos()); + } + } } @Override diff --git a/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java b/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java index ec60b5805..0302ca1d6 100644 --- a/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java +++ b/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java @@ -18,12 +18,8 @@ import java.util.List; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import forestry.api.greenhouse.GreenhouseManager; -import forestry.api.greenhouse.IGreenhouseState; import forestry.api.greenhouse.IInternalBlock; import forestry.api.greenhouse.IInternalBlockFace; -import forestry.api.multiblock.IGreenhouseController; public class InternalBlock implements IInternalBlock { @Nonnull diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java index db56ca1be..173958184 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java @@ -13,11 +13,16 @@ package forestry.greenhouse.tiles; import javax.annotation.Nonnull; import net.minecraft.nbt.NBTTagCompound; -import forestry.api.core.climate.IClimateControlled; -import forestry.api.greenhouse.IGreenhouseHousing; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import forestry.api.core.ForestryAPI; +import forestry.api.core.climate.IClimateWorld; +import forestry.api.core.climate.IClimatedPosition; import forestry.api.multiblock.IGreenhouseComponent; import forestry.api.multiblock.IGreenhouseController; +import forestry.api.multiblock.IMultiblockController; import forestry.apiculture.network.packets.PacketActiveUpdate; +import forestry.core.climate.ClimateWorld; import forestry.core.proxy.Proxies; import forestry.core.tiles.IActivatable; import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; @@ -38,11 +43,22 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat float getBoundaryDown(); + float getMaxChange(); + + int getClimitiseRange(); + + float getClimitiseBonus(); + ClimitiserType getType(); } private final IClimitiserDefinition definition; + protected EnumFacing inwards; + protected EnumFacing leftwards; + protected BlockPos maxPos; + protected BlockPos minPos; + protected int workingTime = 0; private boolean active; @@ -52,23 +68,93 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat } @Override - public void changeClimate(int tick, G greenhouse) { - IGreenhouseControllerInternal greenhouseInternal = (IGreenhouseControllerInternal) greenhouse; - if (workingTime < 20 && greenhouseInternal.getEnergyManager().consumeEnergyToDoWork(WORK_CYCLES, ENERGY_PER_OPERATION)) { - // one tick of work for every 10 RF - workingTime += ENERGY_PER_OPERATION / 10; + public void onMachineBroken() { + inwards = null; + leftwards = null; + + minPos = null; + maxPos = null; + } + + @Override + public void onMachineAssembled(IMultiblockController multiblockController, BlockPos minCoord, BlockPos maxCoord) { + recalculateDirections(minCoord, maxCoord); + + if(leftwards != null){ + maxPos = getPos().offset(inwards, definition.getClimitiseRange() / 2).offset(leftwards, definition.getClimitiseRange() / 2).offset(EnumFacing.UP, definition.getClimitiseRange() / 2); + minPos = getPos().offset(inwards).offset(leftwards.getOpposite(), definition.getClimitiseRange() / 2).offset(EnumFacing.DOWN, definition.getClimitiseRange() / 2); + + }else{ + maxPos = getPos().offset(inwards, definition.getClimitiseRange() / 2).offset(EnumFacing.EAST, definition.getClimitiseRange() / 2).offset(EnumFacing.NORTH, definition.getClimitiseRange() / 2); + minPos = getPos().offset(inwards).offset(EnumFacing.WEST, definition.getClimitiseRange() / 2).offset(EnumFacing.SOUTH, definition.getClimitiseRange() / 2); } - - if (workingTime > 0) { - workingTime--; - if (definition.getType() == ClimitiserType.TEMPERATURE) { - greenhouse.addTemperatureChange(definition.getChangePerTransfer(), definition.getBoundaryDown(), definition.getBoundaryUp()); - } else if (definition.getType() == ClimitiserType.HUMIDITY) { - greenhouse.addHumidityChange(definition.getChangePerTransfer(), definition.getBoundaryDown(), definition.getBoundaryUp()); + } + + @Override + public void changeClimate(int tick, IGreenhouseController greenhouse) { + if(minPos != null && maxPos != null){ + IGreenhouseControllerInternal greenhouseInternal = (IGreenhouseControllerInternal) greenhouse; + if (workingTime == 0 && greenhouseInternal.getEnergyManager().consumeEnergyToDoWork(WORK_CYCLES, ENERGY_PER_OPERATION)) { + int dimensionID = worldObj.provider.getDimension(); + IClimateWorld climateWorld = ForestryAPI.climateManager.getClimateWorlds().get(Integer.valueOf(dimensionID)); + if(climateWorld == null){ + climateWorld = new ClimateWorld(); + ForestryAPI.climateManager.getClimateWorlds().put(Integer.valueOf(dimensionID), climateWorld); + } + + for(BlockPos pos : BlockPos.getAllInBox(maxPos, minPos)){ + IClimatedPosition position = climateWorld.getPosition(pos); + if(position != null){ + if (definition.getType() == ClimitiserType.TEMPERATURE) { + if(position.getTemperature() >= 2.0F){ + if(position.getTemperature() > 2.0F){ + position.setTemperature(2.0F); + } + continue; + }else if(position.getTemperature() <= 0.0F){ + if(position.getTemperature() < 0.0F){ + position.setTemperature(0.0F); + } + continue; + } + }else{ + if(position.getHumidity() >= 2.0F){ + if(position.getHumidity() > 2.0F){ + position.setHumidity(2.0F); + } + continue; + }else if(position.getHumidity() <= 0.0F){ + if(position.getHumidity() < 0.0F){ + position.setHumidity(0.0F); + } + continue; + } + } + + double distance = pos.distanceSq(pos); + int maxDistance = definition.getClimitiseRange(); + if(distance <= maxDistance){ + if (definition.getType() == ClimitiserType.TEMPERATURE) { + position.setTemperature(position.getTemperature() + (float) (definition.getMaxChange() / (distance / definition.getClimitiseBonus()))); + }else{ + position.setHumidity(position.getHumidity() + (float) (definition.getMaxChange() / (distance / definition.getClimitiseBonus()))); + } + } + } + } + + // one tick of work for every 10 RF + workingTime += ENERGY_PER_OPERATION / 10; } + + if (workingTime > 0) { + workingTime--; + } + + setActive(workingTime > 0); + }else if(isActive()){ + setActive(false); } - - setActive(workingTime > 0); } /* LOADING & SAVING */ @@ -106,6 +192,41 @@ 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() == getPos().getX() || minCoord.getX() == getPos().getX()) { + facesMatching++; + } + if (maxCoord.getY() == getPos().getY() || minCoord.getY() == getPos().getY()) { + facesMatching++; + } + if (maxCoord.getZ() == getPos().getZ() || minCoord.getZ() == getPos().getZ()) { + facesMatching++; + } + if (facesMatching == 1) { + if (maxCoord.getX() == getPos().getX()) { + inwards = EnumFacing.WEST; + leftwards = EnumFacing.SOUTH; + } else if (minCoord.getX() == getPos().getX()) { + inwards = EnumFacing.EAST; + leftwards = EnumFacing.NORTH; + } else if (maxCoord.getZ() == getPos().getZ()) { + inwards = EnumFacing.NORTH; + leftwards = EnumFacing.WEST; + } else if (minCoord.getZ() == getPos().getZ()) { + inwards = EnumFacing.SOUTH; + leftwards = EnumFacing.EAST; + } else if (maxCoord.getY() == getPos().getY()) { + inwards = EnumFacing.DOWN; + } else { + inwards = EnumFacing.UP; + } + } + } + public IClimitiserDefinition getDefinition() { return definition; } diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index 5210764e4..278ae6ec1 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -14,16 +14,12 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import forestry.api.apiculture.FlowerManager; import forestry.api.core.ForestryAPI; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index d409e158c..b68a506cc 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -25,7 +25,6 @@ import forestry.core.items.ItemCrated; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; -import forestry.core.utils.OreDictUtil; public class CrateRegistry implements ICrateRegistry {