mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
Fix #1469 Wrong climate info when apiary is placed in greenhouse.
This commit is contained in:
1 parent
321e316665
commit
e71edd5855
6 files changed
+81
-24
No files matched your search
@@ -20,6 +20,7 @@ public interface IClimateManager {
|
||||
|
||||
float getHumidity(World world, BlockPos pos);
|
||||
|
||||
@Nonnull
|
||||
IClimateProvider getDefaultClimate(World world, BlockPos pos);
|
||||
|
||||
void addRegion(IClimateRegion region);
|
||||
@@ -30,6 +31,9 @@ public interface IClimateManager {
|
||||
|
||||
void removeSource(IClimateSourceProvider source);
|
||||
|
||||
@Nullable
|
||||
IClimatePosition getPosition(World world, BlockPos pos);
|
||||
|
||||
@Nullable
|
||||
IClimateRegion getRegionForPos(World world, BlockPos pos);
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ import forestry.api.apiculture.IBeeListener;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.apiculture.IBeekeepingLogic;
|
||||
import forestry.api.climate.IClimateControlled;
|
||||
import forestry.api.climate.IClimatePosition;
|
||||
import forestry.api.core.BiomeHelper;
|
||||
import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
@@ -39,6 +40,7 @@ import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
import forestry.core.utils.ClimateUtil;
|
||||
import forestry.core.utils.Translator;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
@@ -425,6 +427,10 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
|
||||
data.writeVarInt(beekeepingLogic.getBeeProgressPercent());
|
||||
data.writeVarInt(Math.round(tempChange * 100));
|
||||
data.writeVarInt(Math.round(humidChange * 100));
|
||||
IClimatePosition position = ForestryAPI.climateManager.getPosition(worldObj, getReferenceCoord());
|
||||
if(position != null){
|
||||
ClimateUtil.writePositionData(position, data);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -432,5 +438,11 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple
|
||||
breedingProgressPercent = data.readVarInt();
|
||||
tempChange = data.readVarInt() / 100.0F;
|
||||
humidChange = data.readVarInt() / 100.0F;
|
||||
breedingProgressPercent = data.readVarInt();
|
||||
IClimatePosition position = ForestryAPI.climateManager.getPosition(worldObj, getReferenceCoord());
|
||||
if(position != null){
|
||||
ClimateUtil.readPositionData(position, data);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import com.mojang.authlib.GameProfile;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.IBeekeepingLogic;
|
||||
import forestry.api.climate.IClimatePosition;
|
||||
import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.core.ForestryAPI;
|
||||
@@ -30,6 +31,7 @@ import forestry.core.owner.OwnerHandler;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.tiles.IClimatised;
|
||||
import forestry.core.tiles.TileBase;
|
||||
import forestry.core.utils.ClimateUtil;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.world.World;
|
||||
@@ -153,11 +155,19 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing
|
||||
@Override
|
||||
public void writeGuiData(DataOutputStreamForestry data) throws IOException {
|
||||
data.writeVarInt(beeLogic.getBeeProgressPercent());
|
||||
IClimatePosition position = ForestryAPI.climateManager.getPosition(worldObj, getPos());
|
||||
if(position != null){
|
||||
ClimateUtil.writePositionData(position, data);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readGuiData(DataInputStreamForestry data) throws IOException {
|
||||
breedingProgressPercent = data.readVarInt();
|
||||
IClimatePosition position = ForestryAPI.climateManager.getPosition(worldObj, getPos());
|
||||
if(position != null){
|
||||
ClimateUtil.readPositionData(position, data);
|
||||
}
|
||||
}
|
||||
|
||||
// / IBEEHOUSING
|
||||
|
||||
@@ -20,11 +20,11 @@ import forestry.api.climate.IClimatePosition;
|
||||
import forestry.api.climate.IClimateProvider;
|
||||
import forestry.api.climate.IClimateRegion;
|
||||
import forestry.api.climate.IClimateSourceProvider;
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.core.DefaultClimateProvider;
|
||||
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.Biome;
|
||||
|
||||
public class ClimateManager implements IClimateManager{
|
||||
|
||||
@@ -115,36 +115,43 @@ public class ClimateManager implements IClimateManager{
|
||||
|
||||
@Override
|
||||
public float getTemperature(World world, BlockPos pos) {
|
||||
Biome biome = world.getBiome(pos);
|
||||
IClimateRegion region = getRegionForPos(world, pos);
|
||||
if(region!= null){
|
||||
IClimatePosition position = region.getPositions().get(pos);
|
||||
IClimatePosition position = ForestryAPI.climateManager.getPosition(world, pos);
|
||||
|
||||
if(position != null){
|
||||
return position.getTemperature();
|
||||
}
|
||||
if(position != null){
|
||||
return position.getTemperature();
|
||||
}
|
||||
return biome.getTemperature();
|
||||
return world.getBiome(pos).getTemperature();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getHumidity(World world, BlockPos pos) {
|
||||
Biome biome = world.getBiome(pos);
|
||||
IClimateRegion region = getRegionForPos(world, pos);
|
||||
if(region!= null){
|
||||
IClimatePosition position = region.getPositions().get(pos);
|
||||
IClimatePosition position = ForestryAPI.climateManager.getPosition(world, pos);
|
||||
|
||||
if(position != null){
|
||||
return position.getHumidity();
|
||||
}
|
||||
if(position != null){
|
||||
return position.getHumidity();
|
||||
}
|
||||
return biome.getRainfall();
|
||||
return world.getBiome(pos).getRainfall();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Integer, List<IClimateRegion>> getRegions() {
|
||||
return regions;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IClimatePosition getPosition(World world, BlockPos pos){
|
||||
Integer dimensionID = Integer.valueOf(world.provider.getDimension());
|
||||
if(!regions.containsKey(dimensionID)){
|
||||
regions.put(dimensionID, new ArrayList<>());
|
||||
return null;
|
||||
}
|
||||
for(IClimateRegion region : regions.get(dimensionID)){
|
||||
if(region.getPositions().keySet().contains(pos)){
|
||||
return region.getPositions().get(pos);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IClimateRegion getRegionForPos(World world, BlockPos pos){
|
||||
|
||||
@@ -25,6 +25,7 @@ import forestry.api.climate.IClimateSource;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.network.IStreamable;
|
||||
import forestry.core.utils.ClimateUtil;
|
||||
import forestry.greenhouse.multiblock.IGreenhouseControllerInternal;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
@@ -245,7 +246,7 @@ public class ClimateRoom implements IClimateRegion, IStreamable {
|
||||
return positions;
|
||||
}
|
||||
|
||||
protected void addPosition(BlockPos pos, float temperature, float humidity){
|
||||
public void addPosition(BlockPos pos, float temperature, float humidity){
|
||||
IClimatePosition otherPosition = positions.get(pos);
|
||||
if(otherPosition != null){
|
||||
otherPosition.setHumidity(humidity);
|
||||
@@ -284,11 +285,7 @@ public class ClimateRoom implements IClimateRegion, IStreamable {
|
||||
if(!positions.isEmpty()){
|
||||
data.writeInt(positions.size());
|
||||
for(IClimatePosition pos : positions.values()){
|
||||
data.writeInt(pos.getPos().getX());
|
||||
data.writeInt(pos.getPos().getY());
|
||||
data.writeInt(pos.getPos().getZ());
|
||||
data.writeFloat(pos.getTemperature());
|
||||
data.writeFloat(pos.getHumidity());
|
||||
ClimateUtil.writeRoomPositionData(pos, data);
|
||||
}
|
||||
data.writeFloat(temperature);
|
||||
data.writeFloat(humidity);
|
||||
@@ -303,7 +300,7 @@ public class ClimateRoom implements IClimateRegion, IStreamable {
|
||||
if(size != 0){
|
||||
positions.clear();;
|
||||
for(int index = 0;index < size;index++){
|
||||
addPosition(new BlockPos(data.readInt(), data.readInt(), data.readInt()), data.readFloat(), data.readFloat());
|
||||
ClimateUtil.readRoomPositionData(this, data);
|
||||
}
|
||||
temperature = data.readFloat();
|
||||
humidity = data.readFloat();
|
||||
|
||||
@@ -10,13 +10,19 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.utils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Locale;
|
||||
|
||||
import forestry.api.climate.IClimatePosition;
|
||||
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.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
||||
public class ClimateUtil implements IClimateHelper {
|
||||
|
||||
@@ -203,4 +209,25 @@ public class ClimateUtil implements IClimateHelper {
|
||||
public String toDisplay(EnumHumidity humidity) {
|
||||
return Translator.translateToLocal("for.gui." + humidity.toString().toLowerCase(Locale.ENGLISH));
|
||||
}
|
||||
|
||||
public static void writeRoomPositionData(IClimatePosition position, DataOutputStreamForestry data) throws IOException {
|
||||
data.writeInt(position.getPos().getX());
|
||||
data.writeInt(position.getPos().getY());
|
||||
data.writeInt(position.getPos().getZ());
|
||||
writePositionData(position, data);
|
||||
}
|
||||
|
||||
public static void writePositionData(IClimatePosition position, DataOutputStreamForestry data) throws IOException {
|
||||
data.writeFloat(position.getTemperature());
|
||||
data.writeFloat(position.getHumidity());
|
||||
}
|
||||
|
||||
public static void readRoomPositionData(ClimateRoom room, DataInputStreamForestry data) throws IOException {
|
||||
room.addPosition(new BlockPos(data.readInt(), data.readInt(), data.readInt()), data.readFloat(), data.readFloat());
|
||||
}
|
||||
|
||||
public static void readPositionData(IClimatePosition position, DataInputStreamForestry data) throws IOException {
|
||||
position.setHumidity(data.readFloat());
|
||||
position.setTemperature(data.readFloat());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user