diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index 871b0c984..7a8194b63 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import javax.annotation.Nullable; import java.util.List; /** @@ -34,7 +35,10 @@ public interface IWireframeCoordinateListProvider { * This is useful to indicate the precedence of some position over the others. * @return The position of a single wireframe to draw thicker than all the others. */ - public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack); + @Nullable + default BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) { + return null; + } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 153138d2a..65321d137 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -182,8 +182,21 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } @Override + @OnlyIn(Dist.CLIENT) public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) { - return getLokiRing(player) == stack ? getOriginPos(stack) : null; + Minecraft mc = Minecraft.getInstance(); + if (getLokiRing(player) == stack) { + BlockPos currentBuildCenter = getOriginPos(stack); + if (currentBuildCenter.getY() != -1) { + return currentBuildCenter; + } else if (mc.objectMouseOver instanceof BlockRayTraceResult + && mc.objectMouseOver.getType() == RayTraceResult.Type.BLOCK + && !getCursorList(stack).isEmpty()) { + return ((BlockRayTraceResult) mc.objectMouseOver).getPos(); + } + } + + return null; } private static ItemStack getLokiRing(PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 7ade1c670..746e4cca1 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -384,9 +384,4 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return ImmutableList.of(); } - @Override - public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) { - return null; - } - }