diff --git a/build.gradle b/build.gradle index db63b49..1b27d6c 100644 --- a/build.gradle +++ b/build.gradle @@ -29,14 +29,14 @@ group= "magicbees" // http://maven.apache.org/guides/mini/guide-naming-conventio archivesBaseName = "magicbees" minecraft { - version = "1.7.10-10.13.0.1208" + version = "1.7.10-10.13.2.1230" assetDir = "eclipse/assets" } dependencies { - compile files("/libs/Thaumcraft-1.7.10-4.2.0.0.jar") - compile 'net.sengir.forestry:forestry_1.7.10:3.1.1.4:dev' - compile files("/libs/Blood Magic-v1.1.0(1.7.10).jar") + compile files("/libs/Thaumcraft-1.7.10-4.2.3.0.jar") + compile 'net.sengir.forestry:forestry_1.7.10:3.3.0.6:dev' + compile files("/libs/BloodMagic-1.7.10-1.3.0a-1.jar") } processResources @@ -58,3 +58,10 @@ processResources exclude 'mcmod.info' } } + +idea { + module { + inheritOutputDirs = true + } +} + diff --git a/src/main/java/magicbees/storage/BackpackDefinition.java b/src/main/java/magicbees/storage/BackpackDefinition.java index 56f319d..a997049 100644 --- a/src/main/java/magicbees/storage/BackpackDefinition.java +++ b/src/main/java/magicbees/storage/BackpackDefinition.java @@ -39,6 +39,11 @@ public class BackpackDefinition implements IBackpackDefinition return name; } + @Override + public String getName() { + return name; + } + @Override public int getPrimaryColour() { diff --git a/src/main/java/magicbees/tileentity/EffectJarHousing.java b/src/main/java/magicbees/tileentity/EffectJarHousing.java index bf98e2e..5605a59 100644 --- a/src/main/java/magicbees/tileentity/EffectJarHousing.java +++ b/src/main/java/magicbees/tileentity/EffectJarHousing.java @@ -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 diff --git a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java index fe63342..04c2e14 100644 --- a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java @@ -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