mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-16 15:24:46 +00:00
Revert "Added several more functions to pre-existing classes:"
This reverts commit e9a8f8cebc.
This commit is contained in:
1 parent
0d3436c71b
commit
6ae465c5d0
51 files changed
+226
-1024
No files matched your search
@@ -10,7 +10,7 @@ import net.minecraft.util.math.BlockPos;
|
||||
import noppes.npcs.scripted.interfaces.IPos;
|
||||
|
||||
public class ScriptBlockPos implements IPos {
|
||||
public BlockPos blockPos;
|
||||
private BlockPos blockPos;
|
||||
|
||||
public ScriptBlockPos(BlockPos pos) {
|
||||
this.blockPos = pos;
|
||||
@@ -29,75 +29,75 @@ public class ScriptBlockPos implements IPos {
|
||||
}
|
||||
|
||||
public IPos up() {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.up());
|
||||
return new ScriptBlockPos(this.blockPos.up());
|
||||
}
|
||||
|
||||
public IPos up(int n) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.up(n));
|
||||
return new ScriptBlockPos(this.blockPos.up(n));
|
||||
}
|
||||
|
||||
public IPos down() {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.down());
|
||||
return new ScriptBlockPos(this.blockPos.down());
|
||||
}
|
||||
|
||||
public IPos down(int n) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.down(n));
|
||||
return new ScriptBlockPos(this.blockPos.down(n));
|
||||
}
|
||||
|
||||
public IPos north() {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.north());
|
||||
return new ScriptBlockPos(this.blockPos.north());
|
||||
}
|
||||
|
||||
public IPos north(int n) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.north(n));
|
||||
return new ScriptBlockPos(this.blockPos.north(n));
|
||||
}
|
||||
|
||||
public IPos east() {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.east());
|
||||
return new ScriptBlockPos(this.blockPos.east());
|
||||
}
|
||||
|
||||
public IPos east(int n) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.east(n));
|
||||
return new ScriptBlockPos(this.blockPos.east(n));
|
||||
}
|
||||
|
||||
public IPos south() {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.south());
|
||||
return new ScriptBlockPos(this.blockPos.south());
|
||||
}
|
||||
|
||||
public IPos south(int n) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.south(n));
|
||||
return new ScriptBlockPos(this.blockPos.south(n));
|
||||
}
|
||||
|
||||
public IPos west() {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.west());
|
||||
return new ScriptBlockPos(this.blockPos.west());
|
||||
}
|
||||
|
||||
public IPos west(int n) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.west(n));
|
||||
return new ScriptBlockPos(this.blockPos.west(n));
|
||||
}
|
||||
|
||||
public IPos add(int x, int y, int z) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.add(x, y, z));
|
||||
return new ScriptBlockPos(this.blockPos.add(x, y, z));
|
||||
}
|
||||
|
||||
public IPos add(IPos pos) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.add(this.blockPos));
|
||||
return new ScriptBlockPos(this.blockPos.add(this.blockPos));
|
||||
}
|
||||
|
||||
public IPos subtract(int x, int y, int z) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.add(-x, -y, -z));
|
||||
return new ScriptBlockPos(this.blockPos.add(-x, -y, -z));
|
||||
}
|
||||
|
||||
public IPos subtract(IPos pos) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.add(-pos.getX(), -pos.getY(), -pos.getZ()));
|
||||
return new ScriptBlockPos(this.blockPos.add(-pos.getX(), -pos.getY(), -pos.getZ()));
|
||||
}
|
||||
|
||||
public IPos offset(int direction) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.offset(EnumFacing.values()[direction]));
|
||||
return new ScriptBlockPos(this.blockPos.offset(EnumFacing.values()[direction]));
|
||||
}
|
||||
|
||||
public IPos offset(int direction, int n) {
|
||||
return NpcAPI.Instance().getIPos(this.blockPos.offset(EnumFacing.values()[direction], n));
|
||||
return new ScriptBlockPos(this.blockPos.offset(EnumFacing.values()[direction], n));
|
||||
}
|
||||
|
||||
public double[] normalize() {
|
||||
@@ -111,8 +111,4 @@ public class ScriptBlockPos implements IPos {
|
||||
double d2 = (double)(this.getZ() - pos.getZ());
|
||||
return Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2);
|
||||
}
|
||||
|
||||
public BlockPos getMCPos() {
|
||||
return this.blockPos;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user