Remove deprecated sameAs for blocks
This commit is contained in:
@@ -2,8 +2,6 @@ package appeng.api.definitions;
|
|||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
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.
|
* @return true if the item stack is a matching item.
|
||||||
*/
|
*/
|
||||||
boolean isSameAs( ItemStack comparableStack );
|
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 );
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,10 +66,4 @@ public final class DamagedItemDefinition implements IItemDefinition
|
|||||||
|
|
||||||
return comparableStack.getItem() == this.source.getItem() && comparableStack.getItemDamage() == this.source.getDamage();
|
return comparableStack.getItem() == this.source.getItem() && comparableStack.getItemDamage() == this.source.getDamage();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSameAs( IBlockAccess world, BlockPos pos )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,16 +19,15 @@
|
|||||||
package appeng.core.features;
|
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.Optional;
|
||||||
import com.google.common.base.Preconditions;
|
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
|
public class ItemDefinition implements IItemDefinition
|
||||||
{
|
{
|
||||||
@@ -68,10 +67,4 @@ public class ItemDefinition implements IItemDefinition
|
|||||||
{
|
{
|
||||||
return this.enabled && Platform.isSameItemType( comparableStack, this.maybeStack( 1 ).get() );
|
return this.enabled && Platform.isSameItemType( comparableStack, this.maybeStack( 1 ).get() );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSameAs( IBlockAccess world, BlockPos pos )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user