Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-01 02:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor tweak for mutable vectors

Browse Source
This commit is contained in:
Jesse Boyd
2019-04-01 03:09:20 +11:00
parent 2165bb127f
commit 92a7bd5e44
120 changed files with 923 additions and 2426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
worldedit-core/src/main/java/com/sk89q/worldedit/util/Location.java
View File

@ -34,10 +34,9 @@ import com.sk89q.worldedit.math.Vector3;
* {@link #equals(Object)} are subject to minor differences caused by
* floating point errors.</p>
*/
public class Location{
public class Location extends Vector3 {
private final Extent extent;
private final Vector3 position;
private final float pitch;
private final float yaw;
@ -127,10 +126,10 @@ public class Location{
*/
public Location(Extent extent, Vector3 position, float yaw, float pitch) {
super(position);
checkNotNull(extent);
checkNotNull(position);
this.extent = extent;
this.position = position;
this.pitch = pitch;
this.yaw = yaw;
}
@ -151,7 +150,7 @@ public class Location{
* @return the new instance
*/
public Location setExtent(Extent extent) {
return new Location(extent, position, getDirection());
return new Location(extent, this, getDirection());
}
/**
@ -170,7 +169,7 @@ public class Location{
* @return the new instance
*/
public Location setYaw(float yaw) {
return new Location(extent, position, yaw, pitch);
return new Location(extent, this, yaw, pitch);
}
/**
@ -189,7 +188,7 @@ public class Location{
* @return the new instance
*/
public Location setPitch(float pitch) {
return new Location(extent, position, yaw, pitch);
return new Location(extent, this, yaw, pitch);
}
/**
@ -200,7 +199,7 @@ public class Location{
* @return the new instance
*/
public Location setDirection(float yaw, float pitch) {
return new Location(extent, position, yaw, pitch);
return new Location(extent, this, yaw, pitch);
}
/**
@ -234,7 +233,7 @@ public class Location{
* @return the new instance
*/
public Location setDirection(Vector3 direction) {
return new Location(extent, position, (float) direction.toYaw(), (float) direction.toPitch());
return new Location(extent, this, (float) direction.toYaw(), (float) direction.toPitch());
}
/**
@ -242,8 +241,8 @@ public class Location{
*
* @return a vector
*/
public Vector3 toVector() {
return position;
public Vector3 vector() {
return this;
}
/**
@ -252,7 +251,7 @@ public class Location{
* @return the X component
*/
public double getX() {
return position.getX();
return this.getX();
}
/**
@ -261,7 +260,7 @@ public class Location{
* @return the rounded X component
*/
public int getBlockX() {
return (int) Math.floor(position.getX());
return (int) Math.floor(this.getX());
}
/**
@ -272,7 +271,7 @@ public class Location{
* @return a new immutable instance
*/
public Location setX(double x) {
return new Location(extent, position.withX(x), yaw, pitch);
return new Location(extent, this.withX(x), yaw, pitch);
}
/**
@ -281,7 +280,7 @@ public class Location{
* @return the Y component
*/
public double getY() {
return position.getY();
return this.getY();
}
/**
@ -290,7 +289,7 @@ public class Location{
* @return the rounded Y component
*/
public int getBlockY() {
return (int) Math.floor(position.getY());
return (int) Math.floor(this.getY());
}
/**
@ -301,7 +300,7 @@ public class Location{
* @return a new immutable instance
*/
public Location setY(double y) {
return new Location(extent, position.withY(y), yaw, pitch);
return new Location(extent, this.withY(y), yaw, pitch);
}
/**
@ -310,7 +309,7 @@ public class Location{
* @return the Z component
*/
public double getZ() {
return position.getZ();
return this.getZ();
}
/**
@ -319,7 +318,7 @@ public class Location{
* @return the rounded Z component
*/
public int getBlockZ() {
return (int) Math.floor(position.getZ());
return (int) Math.floor(this.getZ());
}
/**
@ -330,7 +329,7 @@ public class Location{
* @return a new immutable instance
*/
public Location setZ(double z) {
return new Location(extent, position.withZ(z), yaw, pitch);
return new Location(extent, this.withZ(z), yaw, pitch);
}
/**

9
worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java
View File

@ -19,7 +19,6 @@
package com.sk89q.worldedit.util;
import com.sk89q.worldedit.*;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.Vector3;
@ -49,7 +48,7 @@ public class TargetBlock {
*/
public TargetBlock(Player player) {
this.world = player.getWorld();
this.setValues(player.getLocation().toVector(), player.getLocation().getYaw(), player.getLocation().getPitch(), 300, 1.65, 0.2);
this.setValues(player.getLocation(), player.getLocation().getYaw(), player.getLocation().getPitch(), 300, 1.65, 0.2);
}
/**
@ -61,7 +60,7 @@ public class TargetBlock {
*/
public TargetBlock(Player player, int maxDistance, double checkDistance) {
this.world = player.getWorld();
this.setValues(player.getLocation().toVector(), player.getLocation().getYaw(), player.getLocation().getPitch(), maxDistance, 1.65, checkDistance);
this.setValues(player.getLocation(), player.getLocation().getYaw(), player.getLocation().getPitch(), maxDistance, 1.65, checkDistance);
}
/**
@ -189,12 +188,12 @@ public class TargetBlock {
public Location getAnyTargetBlockFace() {
getAnyTargetBlock();
return getCurrentBlock().setDirection(getCurrentBlock().toVector().subtract(getPreviousBlock().toVector()));
return getCurrentBlock().setDirection(getCurrentBlock().subtract(getPreviousBlock()));
}
public Location getTargetBlockFace() {
getAnyTargetBlock();
return getCurrentBlock().setDirection(getCurrentBlock().toVector().subtract(getPreviousBlock().toVector()));
return getCurrentBlock().setDirection(getCurrentBlock().subtract(getPreviousBlock()));
}
}