Update dependencies (Forge, Forestry, Thaumcraft, BloodMagic)

This commit is contained in:
mezz committed 2015-01-08 23:42:46 -08:00
1 parent dac7c0ddef
commit 9b9926b340
4 files changed
+58 -7

No files matched your search

@@ -39,6 +39,11 @@ public class BackpackDefinition implements IBackpackDefinition
return name;
}
@Override
public String getName() {
return name;
}
@Override
public int getPrimaryColour()
{
@@ -3,9 +3,12 @@ package magicbees.tileentity;
import com.mojang.authlib.GameProfile;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.core.EnumErrorCode;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.genetics.IIndividual;
@@ -145,7 +148,12 @@ public class EffectJarHousing implements IBeeHousing
@Override
public int getBiomeId()
{
return this.jarEntity.getWorldObj().getBiomeGenForCoords(getXCoord(), getYCoord()).biomeID;
return getBiome().biomeID;
}
@Override
public BiomeGenBase getBiome() {
return this.jarEntity.getWorldObj().getBiomeGenForCoords(getXCoord(), getYCoord());
}
@Override
@@ -191,10 +199,21 @@ public class EffectJarHousing implements IBeeHousing
{
}
@Override
public void setErrorState(EnumErrorCode enumErrorCode)
{
}
@Override
public int getErrorOrdinal()
{
return 1; // EnumErrorCode.OK.ordinal() value.
return getErrorState().ordinal();
}
@Override
public EnumErrorCode getErrorState()
{
return EnumErrorCode.OK;
}
@Override
@@ -6,9 +6,12 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.core.EnumErrorCode;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.genetics.IIndividual;
@@ -185,6 +188,12 @@ public class TileEntityThaumicApiary extends TileEntity implements IInventory, I
return 0;
}
@Override
public BiomeGenBase getBiome()
{
return null;
}
@Override
public EnumTemperature getTemperature()
{
@@ -203,10 +212,21 @@ public class TileEntityThaumicApiary extends TileEntity implements IInventory, I
}
@Override
public void setErrorState(EnumErrorCode enumErrorCode) {
}
@Override
public int getErrorOrdinal()
{
return 0;
return getErrorState().ordinal();
}
@Override
public EnumErrorCode getErrorState()
{
return EnumErrorCode.UNKNOWN;
}
@Override