From 8bf47d8f5f673a73fc16f536af354e7753c7ce20 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 11 Jan 2015 01:51:48 -0800 Subject: [PATCH] Update to latest unstable forestry --- build.gradle | 2 +- .../java/magicbees/storage/BackpackDefinition.java | 5 +++++ .../java/magicbees/tileentity/EffectJarHousing.java | 11 ++++++----- .../magicbees/tileentity/TileEntityThaumicApiary.java | 11 ++++++----- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 1b27d6c..4955c79 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ minecraft { dependencies { 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 'net.sengir.forestry:forestry_1.7.10:3.3.0.415-unstable:dev' compile files("/libs/BloodMagic-1.7.10-1.3.0a-1.jar") } diff --git a/src/main/java/magicbees/storage/BackpackDefinition.java b/src/main/java/magicbees/storage/BackpackDefinition.java index a997049..ba26d6c 100644 --- a/src/main/java/magicbees/storage/BackpackDefinition.java +++ b/src/main/java/magicbees/storage/BackpackDefinition.java @@ -68,6 +68,11 @@ public class BackpackDefinition implements IBackpackDefinition @Override public boolean isValidItem(EntityPlayer player, ItemStack itemStack) { + return isValidItem(itemStack); + } + + @Override + public boolean isValidItem(ItemStack itemStack) { boolean flag = false; ItemStack stack; diff --git a/src/main/java/magicbees/tileentity/EffectJarHousing.java b/src/main/java/magicbees/tileentity/EffectJarHousing.java index 5605a59..86006c1 100644 --- a/src/main/java/magicbees/tileentity/EffectJarHousing.java +++ b/src/main/java/magicbees/tileentity/EffectJarHousing.java @@ -8,9 +8,10 @@ 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.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividual; /** @@ -200,20 +201,20 @@ public class EffectJarHousing implements IBeeHousing } @Override - public void setErrorState(EnumErrorCode enumErrorCode) + public void setErrorState(IErrorState enumErrorCode) { } @Override public int getErrorOrdinal() { - return getErrorState().ordinal(); + return getErrorState().getID(); } @Override - public EnumErrorCode getErrorState() + public IErrorState getErrorState() { - return EnumErrorCode.OK; + return ErrorStateRegistry.getErrorState("ok"); } @Override diff --git a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java index 04c2e14..0d881fa 100644 --- a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java @@ -11,9 +11,10 @@ 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.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividual; public class TileEntityThaumicApiary extends TileEntity implements IInventory, IBeeHousing @@ -213,20 +214,20 @@ public class TileEntityThaumicApiary extends TileEntity implements IInventory, I } @Override - public void setErrorState(EnumErrorCode enumErrorCode) { + public void setErrorState(IErrorState enumErrorCode) { } @Override public int getErrorOrdinal() { - return getErrorState().ordinal(); + return getErrorState().getID(); } @Override - public EnumErrorCode getErrorState() + public IErrorState getErrorState() { - return EnumErrorCode.UNKNOWN; + return ErrorStateRegistry.getErrorState("unknown"); } @Override