diff --git a/src/api/java/appeng/api/definitions/IComparableDefinition.java b/src/api/java/appeng/api/definitions/IComparableDefinition.java index 3bd65885..219a53df 100644 --- a/src/api/java/appeng/api/definitions/IComparableDefinition.java +++ b/src/api/java/appeng/api/definitions/IComparableDefinition.java @@ -2,8 +2,6 @@ package appeng.api.definitions; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; /** @@ -23,17 +21,4 @@ public interface IComparableDefinition * @return true if the item stack is a matching item. */ boolean isSameAs( ItemStack comparableStack ); - - /** - * Compare Block with world. - * - * @param world world of block - * @param pos in world. - * - * @return if the block is placed in the world at the specific location. - * - * @deprecated moved to {@link IBlockDefinition}. Is removed in the next major release rv3 - */ - @Deprecated - boolean isSameAs( IBlockAccess world, BlockPos pos ); } diff --git a/src/main/java/appeng/core/features/DamagedItemDefinition.java b/src/main/java/appeng/core/features/DamagedItemDefinition.java index 4d595a24..f33ea920 100644 --- a/src/main/java/appeng/core/features/DamagedItemDefinition.java +++ b/src/main/java/appeng/core/features/DamagedItemDefinition.java @@ -66,10 +66,4 @@ public final class DamagedItemDefinition implements IItemDefinition return comparableStack.getItem() == this.source.getItem() && comparableStack.getItemDamage() == this.source.getDamage(); } - - @Override - public boolean isSameAs( IBlockAccess world, BlockPos pos ) - { - return false; - } } diff --git a/src/main/java/appeng/core/features/ItemDefinition.java b/src/main/java/appeng/core/features/ItemDefinition.java index 9c69c69a..2399bd96 100644 --- a/src/main/java/appeng/core/features/ItemDefinition.java +++ b/src/main/java/appeng/core/features/ItemDefinition.java @@ -19,16 +19,15 @@ package appeng.core.features; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; -import appeng.api.definitions.IItemDefinition; -import appeng.util.Platform; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import appeng.api.definitions.IItemDefinition; +import appeng.util.Platform; + public class ItemDefinition implements IItemDefinition { @@ -68,10 +67,4 @@ public class ItemDefinition implements IItemDefinition { return this.enabled && Platform.isSameItemType( comparableStack, this.maybeStack( 1 ).get() ); } - - @Override - public boolean isSameAs( IBlockAccess world, BlockPos pos ) - { - return false; - } }