tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Remove deprecated sameAs for blocks

This commit is contained in:
thatsIch 2015-06-17 23:32:33 +02:00
parent 0cd25428e6
commit 03eec78d6f
3 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/java/appeng/api/definitions/IComparableDefinition.java
View File

@ -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 );
}

6
src/main/java/appeng/core/features/DamagedItemDefinition.java
View File

@ -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;
}
}

19
src/main/java/appeng/core/features/ItemDefinition.java
View File

@ -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;
}
}