Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-10-30 06:10:51 +01:00
Code Issues Projects Releases Wiki Activity

Fixed up the teleport staff.

Browse source
This commit is contained in:
Flanks255 2024-06-04 16:38:19 -05:00
parent 2cadd9e19a
commit c812512abe
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleportStaff.java
View file

@ -10,6 +10,7 @@
package de.ellpeck.actuallyadditions.mod.items; package de.ellpeck.actuallyadditions.mod.items;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@ -34,11 +35,15 @@ public class ItemTeleportStaff extends ItemEnergy {
ItemStack stack = player.getItemInHand(hand); ItemStack stack = player.getItemInHand(hand);
if (!world.isClientSide) { if (!world.isClientSide) {
HitResult rayTraceResult = player.pick(100,1F,false); HitResult rayTraceResult = player.pick(100,1F,false);
if (rayTraceResult.getType() == HitResult.Type.BLOCK || player.getXRot() >= -5) { if (rayTraceResult.getType() == HitResult.Type.BLOCK || rayTraceResult.getType() == HitResult.Type.MISS) {
Vec3 location = rayTraceResult.getLocation(); Vec3 location = rayTraceResult.getLocation();
Vec3 pos = Vec3.atBottomCenterOf(BlockPos.containing(location.x, location.y, location.z)); Vec3 pos = Vec3.atBottomCenterOf(BlockPos.containing(location.x, location.y, location.z));
int baseUse = 200; int baseUse = 200;
int use = baseUse + (int) (baseUse * player.blockPosition().distSqr(BlockPos.containing(pos.x, pos.y, pos.z))); int use = baseUse + (int) (baseUse * Math.sqrt(player.blockPosition().distManhattan(BlockPos.containing(pos.x, pos.y, pos.z))));
ActuallyAdditions.LOGGER.info("Use: " + use + " Energy: " + this.getEnergyStored(stack));
ActuallyAdditions.LOGGER.info("Distance: " + Math.sqrt(player.blockPosition().distSqr(BlockPos.containing(pos.x, pos.y, pos.z))));
ActuallyAdditions.LOGGER.info("Player: " + player.blockPosition());
ActuallyAdditions.LOGGER.info("Pos: " + pos);
if (this.getEnergyStored(stack) >= use) { if (this.getEnergyStored(stack) >= use) {
((ServerPlayer) player).connection.teleport(pos.x, pos.y + 1F, pos.z, player.getYRot(), player.getXRot()); ((ServerPlayer) player).connection.teleport(pos.x, pos.y + 1F, pos.z, player.getYRot(), player.getXRot());
player.removeVehicle(); player.removeVehicle();