diff --git a/gradle.properties b/gradle.properties index 0feb424c5..7fdbb529e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.7.10 forgeversion=10.13.4.1614-1.7.10 version_major=4 -version_minor=3 +version_minor=4 version_patch=1 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 5183081a1..7bee14ae8 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -12,6 +12,7 @@ package forestry; import java.io.File; +import forestry.core.ClimateManager; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -74,6 +75,7 @@ public class Forestry { public Forestry() { ForestryAPI.instance = this; + ForestryAPI.climateManager = new ClimateManager(); ForestryAPI.forestryConstants = new Constants(); ForestryAPI.errorStateRegistry = new ErrorStateRegistry(); EnumErrorCode.init(); diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java index 786ca58b2..48d1bc348 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutation.java @@ -42,7 +42,7 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom { int y = housingCoordinates.posY; int z = housingCoordinates.posZ; - float processedChance = super.getChance(world, x, y, z, allele0, allele1, genome0, genome1); + float processedChance = super.getChance(world, x, y, z, allele0, allele1, genome0, genome1, housing); if (processedChance <= 0) { return 0; } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java index 4d545df48..045804608 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import forestry.api.core.ForestryAPI; import net.minecraft.world.World; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -33,7 +34,7 @@ public class TreeMutation extends Mutation implements ITreeMutationCustom { @Override public float getChance(World world, int x, int y, int z, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1) { - float processedChance = super.getChance(world, x, y, z, allele0, allele1, genome0, genome1); + float processedChance = super.getChance(world, x, y, z, allele0, allele1, genome0, genome1, ForestryAPI.climateManager.getDefaultClimate(world, x, y, z)); if (processedChance <= 0) { return 0; } diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index e57db6f46..8934a0665 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -23,6 +23,7 @@ import net.minecraft.nbt.NBTUtil; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; import com.mojang.authlib.GameProfile; @@ -39,6 +40,9 @@ import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreekeepingMode; import forestry.api.arboriculture.TreeManager; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IEffectData; @@ -576,4 +580,19 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru ITree tree = getTree(); return !isDecorative && !isDestroyed(tree, damage) && caterpillar == null; } + + @Override + public BiomeGenBase getBiome() { + return worldObj.getBiomeGenForCoords(xCoord, zCoord); + } + + @Override + public EnumTemperature getTemperature() { + return EnumTemperature.getFromBiome(getBiome(), xCoord, yCoord, zCoord); + } + + @Override + public EnumHumidity getHumidity() { + return EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(worldObj, xCoord, yCoord, zCoord)); + } } diff --git a/src/main/java/forestry/core/ClimateManager.java b/src/main/java/forestry/core/ClimateManager.java new file mode 100644 index 000000000..594ef92aa --- /dev/null +++ b/src/main/java/forestry/core/ClimateManager.java @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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; + +import forestry.api.core.IClimateProvider; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + +import forestry.api.core.IClimateManager; + +public class ClimateManager implements IClimateManager { + + @Override + public float getTemperature(World world, int x, int y, int z) { + BiomeGenBase biome = world.getBiomeGenForCoords(x, z); + return biome.temperature; + } + + @Override + public float getHumidity(World world, int x, int y, int z) { + BiomeGenBase biome = world.getBiomeGenForCoords(x, z); + return biome.rainfall; + } + + @Override + public IClimateProvider getDefaultClimate(World world, int x, int y, int z) { + return new DefaultClimateProvider(world, x, y, z); + } +} diff --git a/src/main/java/forestry/core/DefaultClimateProvider.java b/src/main/java/forestry/core/DefaultClimateProvider.java new file mode 100644 index 000000000..e0a96f706 --- /dev/null +++ b/src/main/java/forestry/core/DefaultClimateProvider.java @@ -0,0 +1,36 @@ +package forestry.core; + +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; +import forestry.api.core.IClimateProvider; + +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + +public class DefaultClimateProvider implements IClimateProvider { + private World world; + private int xCoord, yCoord, zCoord; + + public DefaultClimateProvider(World world, int x, int y, int z) { + this.world = world; + this.xCoord = x; + this.yCoord = y; + this.zCoord = z; + } + + @Override + public BiomeGenBase getBiome() { + return world.getBiomeGenForCoords(xCoord, zCoord); + } + + @Override + public EnumTemperature getTemperature() { + return EnumTemperature.getFromBiome(getBiome(), xCoord, yCoord, zCoord); + } + + @Override + public EnumHumidity getHumidity() { + return EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(world, xCoord, yCoord, zCoord)); + } +} diff --git a/src/main/java/forestry/core/genetics/mutations/Mutation.java b/src/main/java/forestry/core/genetics/mutations/Mutation.java index 5adb68c92..9a39c938c 100644 --- a/src/main/java/forestry/core/genetics/mutations/Mutation.java +++ b/src/main/java/forestry/core/genetics/mutations/Mutation.java @@ -21,6 +21,7 @@ import net.minecraftforge.common.BiomeDictionary; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IGenome; @@ -124,10 +125,10 @@ public abstract class Mutation implements IMutationCustom { return this; } - protected float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + protected float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { float mutationChance = chance; for (IMutationCondition mutationCondition : mutationConditions) { - mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1); + mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate); if (mutationChance == 0) { return 0; } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java index 16e8e5d8a..0ebbd57e3 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java @@ -19,6 +19,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; +import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; @@ -33,8 +34,8 @@ public class MutationConditionBiome implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - BiomeGenBase biome = world.getBiomeGenForCoords(x, z); + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { + BiomeGenBase biome = climate.getBiome(); for (BiomeDictionary.Type type : validBiomeTypes) { if (BiomeDictionary.isBiomeOfType(biome, type)) { return 1; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java index 66615c576..b1bead23b 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java @@ -12,6 +12,7 @@ package forestry.core.genetics.mutations; import net.minecraft.world.World; +import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; @@ -26,7 +27,7 @@ public class MutationConditionDaytime implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { if (world.isDaytime() == daytime) { return 1; } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java index de3136804..e321e78b4 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java @@ -11,9 +11,9 @@ package forestry.core.genetics.mutations; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; import forestry.api.core.EnumHumidity; +import forestry.api.core.IClimateProvider; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; @@ -30,9 +30,8 @@ public class MutationConditionHumidity implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(x, z); - EnumHumidity biomeHumidity = EnumHumidity.getFromValue(biome.rainfall); + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { + EnumHumidity biomeHumidity = climate.getHumidity(); if (biomeHumidity.ordinal() < minHumidity.ordinal() || biomeHumidity.ordinal() > maxHumidity.ordinal()) { return 0; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java index efe361bce..a96ceb411 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java @@ -11,6 +11,7 @@ package forestry.core.genetics.mutations; import forestry.api.apiculture.IBeeHousing; +import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; @@ -18,6 +19,7 @@ import forestry.core.utils.BlockUtil; import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.StringUtil; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -34,7 +36,7 @@ public class MutationConditionRequiresResource implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { /* Block block; TileEntity tile; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java index cf15b41ca..137dcc66c 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java @@ -11,11 +11,13 @@ package forestry.core.genetics.mutations; import forestry.api.apiculture.IBeeHousing; +import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.BlockUtil; import forestry.core.utils.StringUtil; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -40,7 +42,7 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { /* Block block; int meta; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java index 650787cb1..f15307a99 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java @@ -11,9 +11,9 @@ package forestry.core.genetics.mutations; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; import forestry.api.core.EnumTemperature; +import forestry.api.core.IClimateProvider; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; @@ -31,9 +31,8 @@ public class MutationConditionTemperature implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(x, z); - EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, x, y, z); + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { + EnumTemperature biomeTemperature = climate.getTemperature(); if (biomeTemperature.ordinal() < minTemperature.ordinal() || biomeTemperature.ordinal() > maxTemperature.ordinal()) { return 0; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java index dc6c47b85..72ff8cc44 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java @@ -14,6 +14,7 @@ import java.util.Calendar; import net.minecraft.world.World; +import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; @@ -31,7 +32,7 @@ public class MutationConditionTimeLimited implements IMutationCondition { } @Override - public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) { DayMonth now = new DayMonth(); // If we are equal to start day, return 1. diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 555415f7d..a9e5a35e1 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -248,7 +248,7 @@ public class Butterfly extends IndividualLiving implements IButterfly { } for (IButterflyMutation mutation : ButterflyManager.butterflyRoot.getMutations(true)) { - float chance = mutation.getChance(nursery, allele0, allele1, genome0, genome1); + float chance = mutation.getChance(nursery, allele0, allele1, genome0, genome1, nursery); if (chance > rand.nextFloat() * 100) { return ButterflyManager.butterflyRoot.templateAsChromosomes(mutation.getTemplate()); }