diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index 5693e691f..942d5ffdb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -52,8 +52,8 @@ public class TileEnderEye extends TileMod implements ITickableTileEntity { if(!helm.isEmpty() && helm.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN)) continue; - RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 64); - if(pos.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) pos).getPos().equals(getPos())) { + BlockRayTraceResult hit = ToolCommons.raytraceFromEntity(player, 64, false); + if(hit.getType() == RayTraceResult.Type.BLOCK && hit.getPos().equals(getPos())) { looking = true; break; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 02e79427b..8e3b0161f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -126,11 +126,10 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { setMotion(Vec3d.ZERO); } else if (liveTime == delay && player != null) { Vector3 playerLook; - RayTraceResult lookat = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.SOURCE_ONLY, 64); - if(lookat.getType() != RayTraceResult.Type.BLOCK) + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 64, true); + if(rtr.getType() != RayTraceResult.Type.BLOCK) playerLook = new Vector3(player.getLookVec()).multiply(64).add(Vector3.fromEntity(player)); else { - BlockRayTraceResult rtr = (BlockRayTraceResult) lookat; playerLook = new Vector3(rtr.getPos().getX() + 0.5, rtr.getPos().getY() + 0.5, rtr.getPos().getZ() + 0.5); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index b3d241c5c..0a5e54806 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -186,7 +186,7 @@ public class ItemAstrolabe extends ItemMod { public static List getBlocksToPlace(ItemStack stack, PlayerEntity player) { List coords = new ArrayList<>(); - BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.SOURCE_ONLY, 5); + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 5, true); if(rtr.getType() == RayTraceResult.Type.BLOCK) { BlockPos pos = rtr.getPos(); BlockState state = player.world.getBlockState(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 1f6b611f8..117ae0cda 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -135,10 +135,10 @@ public class ItemSextant extends ItemMod { public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { ItemStack stack = player.getHeldItem(hand); if(!player.isSneaking()) { - RayTraceResult rtr = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 128); + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 128, false); if(rtr.getType() == RayTraceResult.Type.BLOCK) { if(!world.isRemote) { - BlockPos pos = ((BlockRayTraceResult) rtr).getPos(); + BlockPos pos = rtr.getPos(); ItemNBTHelper.setInt(stack, TAG_SOURCE_X, pos.getX()); ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, pos.getY()); ItemNBTHelper.setInt(stack, TAG_SOURCE_Z, pos.getZ()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index 2478b1f29..d931ed4d3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -41,12 +41,11 @@ public class ItemSwapRing extends ItemBauble { ISortableTool tool = (ISortableTool) currentStack.getItem(); - RayTraceResult pos = ToolCommons.raytraceFromEntity(player.world, player, - RayTraceContext.FluidMode.NONE, 4.5F); + BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(player, 4.5F, false); ToolType typeToFind = null; if(player.isSwingInProgress && pos.getType() == RayTraceResult.Type.BLOCK) { - BlockState state = entity.world.getBlockState(((BlockRayTraceResult) pos).getPos()); + BlockState state = entity.world.getBlockState(pos.getPos()); Material mat = state.getMaterial(); if(ToolCommons.materialsPick.contains(mat)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index b081a1f17..08dc35dcb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -43,9 +43,9 @@ public class ItemStarSword extends ItemManasteelSword { float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !world.isRemote) { - RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 48); + BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(player, 48, false); if(pos.getType() == RayTraceResult.Type.BLOCK) { - Vector3 posVec = Vector3.fromBlockPos(((BlockRayTraceResult) pos).getPos()); + Vector3 posVec = Vector3.fromBlockPos(pos.getPos()); Vector3 motVec = new Vector3((0.5 * Math.random() - 0.25) * 18, 24, (0.5 * Math.random() - 0.25) * 18); posVec = posVec.add(motVec); motVec = motVec.normalize().negate().multiply(1.5); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 1ff1b9723..6ebac1ebf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -27,6 +28,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; @@ -155,19 +157,11 @@ public final class ToolCommons { return materialLevel * 100 + modifier * 10 + efficiency; } - // [VanillaCopy] of Item.rayTrace, edits noted - public static BlockRayTraceResult raytraceFromEntity(World worldIn, PlayerEntity player, RayTraceContext.FluidMode fluidMode, double range) { - float f = player.rotationPitch; - float f1 = player.rotationYaw; - Vec3d vec3d = player.getEyePosition(1.0F); - float f2 = MathHelper.cos(-f1 * ((float)Math.PI / 180F) - (float)Math.PI); - float f3 = MathHelper.sin(-f1 * ((float)Math.PI / 180F) - (float)Math.PI); - float f4 = -MathHelper.cos(-f * ((float)Math.PI / 180F)); - float f5 = MathHelper.sin(-f * ((float)Math.PI / 180F)); - float f6 = f3 * f4; - float f7 = f2 * f4; - double d0 = range; // Botania - use custom range - Vec3d vec3d1 = vec3d.add((double)f6 * d0, (double)f5 * d0, (double)f7 * d0); - return worldIn.rayTraceBlocks(new RayTraceContext(vec3d, vec3d1, RayTraceContext.BlockMode.OUTLINE, fluidMode, player)); + // [VanillaCopy] Exact Entity.func_213324_a but available serverside, partialTicks fixed to 1, and narrowed return type + public static BlockRayTraceResult raytraceFromEntity(Entity e, double distance, boolean fluids) { + Vec3d vec3d = e.getEyePosition(1); + Vec3d vec3d1 = e.getLook(1); + Vec3d vec3d2 = vec3d.add(vec3d1.x * distance, vec3d1.y * distance, vec3d1.z * distance); + return e.world.rayTraceBlocks(new RayTraceContext(vec3d, vec3d2, RayTraceContext.BlockMode.OUTLINE, fluids ? RayTraceContext.FluidMode.ANY : RayTraceContext.FluidMode.NONE, e)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index cc07c2b7e..0ec7b16d5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -90,9 +90,9 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, PlayerEntity player) { - RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.NONE, 10); + BlockRayTraceResult raycast = ToolCommons.raytraceFromEntity(player, 10, false); if(raycast.getType() == RayTraceResult.Type.BLOCK) { - Direction face = ((BlockRayTraceResult) raycast).getFace(); + Direction face = raycast.getFace(); breakOtherBlock(player, stack, pos, pos, face); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, face); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 4b7b41223..3334ff123 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -148,9 +148,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, PlayerEntity player) { - RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.NONE, 10); + BlockRayTraceResult raycast = ToolCommons.raytraceFromEntity(player, 10, false); if(!player.world.isRemote && raycast.getType() == RayTraceResult.Type.BLOCK) { - Direction face = ((BlockRayTraceResult) raycast).getFace(); + Direction face = raycast.getFace(); breakOtherBlock(player, stack, pos, pos, face); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, face); // ^ Doable with API access through the IInternalMethodHandler. @@ -177,8 +177,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(world.isAirBlock(pos)) return; - int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); - boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; boolean thor = !ItemThorRing.getThorRing(player).isEmpty(); boolean doX = thor || side.getXOffset() == 0; boolean doY = thor || side.getYOffset() == 0; 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 0b9e33f06..962dc4d90 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -70,14 +70,14 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat ItemStack heldItemStack = event.getItemStack(); BlockPos originCoords = getOriginPos(lokiRing); - RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.ANY, 10F); + BlockRayTraceResult lookPos = ToolCommons.raytraceFromEntity(player, 10F, true); List cursors = getCursorList(lokiRing); int cost = Math.min(cursors.size(), (int) Math.pow(Math.E, cursors.size() * 0.25)); if(lookPos.getType() != RayTraceResult.Type.BLOCK) return; - BlockPos hit = ((BlockRayTraceResult) lookPos).getPos(); + BlockPos hit = lookPos.getPos(); if(heldItemStack.isEmpty()) { if(!event.getWorld().isRemote) { if(originCoords.getY() == -1) { @@ -111,7 +111,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat if(player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { ItemStack saveHeld = heldItemStack.copy(); BlockRayTraceResult newHit = new BlockRayTraceResult( - lookPos.getHitVec().subtract(pos.getX(), pos.getY(), pos.getZ()), + lookPos.getHitVec().add(pos.getX(), pos.getY(), pos.getZ()), ((BlockRayTraceResult) lookPos).getFace(), pos, false); heldItemStack.onItemUse(new ItemUseContext(player, event.getHand(), newHit)); if(player.isCreative()) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index dee670c90..677409ee4 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -80,10 +80,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { if(!ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, false)) return; - RayTraceResult ray = ToolCommons.raytraceFromEntity(p.world, p, RayTraceContext.FluidMode.NONE, 32); + BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(p, 32, false); - if(ray.getType() == RayTraceResult.Type.BLOCK) { - BlockRayTraceResult pos = (BlockRayTraceResult) ray; + if(pos.getType() == RayTraceResult.Type.BLOCK) { BlockState state = p.world.getBlockState(pos.getPos()); dummyInv.setInventorySlotContents(0, new ItemStack(state.getBlock())); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 84d5b2888..de447729c 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -106,8 +106,7 @@ public final class SkyblockWorldEvents { event.setCancellationResult(ActionResultType.SUCCESS); } } else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL) { - BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(event.getWorld(), player, - RayTraceContext.FluidMode.SOURCE_ONLY, 4.5F); + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 4.5F, true); if(rtr.getType() == RayTraceResult.Type.BLOCK) { BlockPos pos = rtr.getPos(); if(event.getWorld().getBlockState(pos).getMaterial() == Material.WATER) {