diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index b3ce32b5e..3a995ce19 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -12,6 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.util.math.BlockPos; +import javax.annotation.Nullable; + /** * Any TileEntity that implements this is technically bound * to something, and the binding will be shown when hovering @@ -20,8 +22,9 @@ import net.minecraft.util.math.BlockPos; public interface ITileBound { /** - * Gets where this block is bound to, can return null. + * Gets where this block is bound to */ + @Nullable public BlockPos getBinding(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 93c28885f..85abf0129 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -24,6 +24,7 @@ import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public abstract class TileRedString extends TileMod implements ITileBound, ITickableTileEntity { @@ -73,6 +74,7 @@ public abstract class TileRedString extends TileMod implements ITileBound, ITick return INFINITE_EXTENT_AABB; } + @Nullable @Override public BlockPos getBinding() { return binding; @@ -83,11 +85,7 @@ public abstract class TileRedString extends TileMod implements ITileBound, ITick } public Direction getOrientation() { - BlockState state = world.getBlockState(getPos()); - if(state.getProperties().contains(BotaniaStateProps.FACING)) - return state.get(BotaniaStateProps.FACING); - - return Direction.WEST; // fallback + return getBlockState().get(BotaniaStateProps.FACING); } public TileEntity getTileAtBinding() { @@ -103,10 +101,4 @@ public abstract class TileRedString extends TileMod implements ITileBound, ITick public Block getBlockAtBinding() { return getStateAtBinding().getBlock(); } - - @Override - public boolean hasFastRenderer() { - return true; - } - }