From d977104107143fec49eab5c5cf6d6be34dc6e9ad Mon Sep 17 00:00:00 2001 From: bluefireoly Date: Sun, 13 Sep 2020 17:45:36 +0200 Subject: [PATCH] Update ModificationExtensions.kt --- .../geometry/ModificationExtensions.kt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/net/axay/kspigot/extensions/geometry/ModificationExtensions.kt b/src/main/kotlin/net/axay/kspigot/extensions/geometry/ModificationExtensions.kt index 94110a90..4f19b247 100644 --- a/src/main/kotlin/net/axay/kspigot/extensions/geometry/ModificationExtensions.kt +++ b/src/main/kotlin/net/axay/kspigot/extensions/geometry/ModificationExtensions.kt @@ -12,7 +12,6 @@ import org.bukkit.util.Vector // INCREASE // all infix fun Location.increase(distance: Number) = add(distance, distance, distance) -infix fun Location.increase(vec: Vector) = add(vec) // single infix fun Location.increaseX(distance: Number) = add(distance, 0.0, 0.0) infix fun Location.increaseY(distance: Number) = add(0.0, distance, 0.0) @@ -25,7 +24,6 @@ infix fun Location.increaseXZ(distance: Number) = add(distance, 0.0, distance) // REDUCE // all infix fun Location.reduce(distance: Number) = substract(distance, distance, distance) -infix fun Location.reduce(vec: Vector) = subtract(vec) // single infix fun Location.reduceX(distance: Number) = substract(distance, 0.0, 0.0) infix fun Location.reduceY(distance: Number) = substract(0.0, distance, 0.0) @@ -59,6 +57,13 @@ operator fun Location.plusAssign(loc: Location) { add(loc) } operator fun Location.minusAssign(loc: Location) { subtract(loc) } operator fun Location.plusAssign(loc: SimpleLocation3D) { add(loc.x, loc.y, loc.z) } operator fun Location.minusAssign(loc: SimpleLocation3D) { subtract(loc.x, loc.y, loc.z) } +// mutable with return +infix fun Location.increase(vec: Vector) = add(vec) +infix fun Location.reduce(vec: Vector) = subtract(vec) +infix fun Location.increase(loc: Location) = add(loc) +infix fun Location.reduce(loc: Location) = subtract(loc) +infix fun Location.increase(loc: SimpleLocation3D) = add(loc.x, loc.y, loc.z) +infix fun Location.reduce(loc: SimpleLocation3D) = subtract(loc.x, loc.y, loc.z) /* VECTOR @@ -85,4 +90,9 @@ operator fun Vector.times(num: Number) = clone().multiply(num.toDouble()) operator fun Vector.plusAssign(vec: Vector) { add(vec) } operator fun Vector.minusAssign(vec: Vector) { subtract(vec) } operator fun Vector.timesAssign(vec: Vector) { multiply(vec) } -operator fun Vector.timesAssign(num: Number) { multiply(num.toDouble()) } \ No newline at end of file +operator fun Vector.timesAssign(num: Number) { multiply(num.toDouble()) } +// mutable with return +infix fun Vector.increase(vec: Vector) = add(vec) +infix fun Vector.reduce(vec: Vector) = subtract(vec) +infix fun Vector.multiply(vec: Vector) = multiply(vec) +infix fun Vector.multiply(num: Number) = multiply(num.toDouble()) \ No newline at end of file