updated ue api; added remark on single quotes to sh manpage

This commit is contained in:
Florian Nücke 2014-01-31 13:02:42 +01:00
parent 121dce4a93
commit 1aafa9657a
5 changed files with 24 additions and 3 deletions

View File

@ -9,7 +9,7 @@ DESCRIPTION
Arguments to programs can be quoted, to provide strings with multiple spaces in them, for example: Arguments to programs can be quoted, to provide strings with multiple spaces in them, for example:
echo "a b" echo "a b"
will print the string `a b` to the screen. will print the string `a b` to the screen. It is also possible to use single quotes (echo 'a b').
The OpenOS shell provides basic redirects and piping: The OpenOS shell provides basic redirects and piping:

View File

@ -7,7 +7,7 @@
"version": "1.2.0", "version": "1.2.0",
"mcversion": "1.6.4", "mcversion": "1.6.4",
"url": "https://github.com/MightyPirates/OpenComputers/wiki", "url": "https://github.com/MightyPirates/OpenComputers/wiki",
"authors": ["Florian 'Sangar' Nücke", "Johannes 'Lord Joda' Lohrer"], "authors": ["Florian 'Sangar' Nücke", "Johannes 'Lord Joda' Lohrer", "Everyone who contributed to the mod on Github - thank you!"],
"credits" : "Inspired by a couple of other mods, most notably ComputerCraft.", "credits" : "Inspired by a couple of other mods, most notably ComputerCraft.",
"logoFile" : "assets/opencomputers/textures/gui/logo.png", "logoFile" : "assets/opencomputers/textures/gui/logo.png",
"requiredMods": [ "Forge@[9.11.1.940,)" ], "requiredMods": [ "Forge@[9.11.1.940,)" ],

View File

@ -13,5 +13,6 @@ public interface IConnectable
* *
* @return Return true, if the connection is possible. * @return Return true, if the connection is possible.
*/ */
@Deprecated
public boolean canConnect(ForgeDirection direction); public boolean canConnect(ForgeDirection direction);
} }

View File

@ -81,6 +81,11 @@ public class Vector2 implements Cloneable
return yDiference / xDifference; return yDiference / xDifference;
} }
public Vector2 midPoint(Vector2 pos)
{
return new Vector2((x + pos.x) / 2, (y + pos.y) / 2);
}
public double distance(Vector2 target) public double distance(Vector2 target)
{ {
Vector2 difference = this.clone().subtract(target); Vector2 difference = this.clone().subtract(target);
@ -110,7 +115,7 @@ public class Vector2 implements Cloneable
public Vector2 invert() public Vector2 invert()
{ {
this.multiply(-1); this.scale(-1);
return this; return this;
} }

View File

@ -412,6 +412,16 @@ public class Vector3 implements Cloneable
return vec.scale(amount); return vec.scale(amount);
} }
public Vector3 max(Vector3 other)
{
return new Vector3(Math.max(x, other.x), Math.max(y, other.y), Math.max(z, other.z));
}
public Vector3 min(Vector3 other)
{
return new Vector3(Math.min(x, other.x), Math.min(y, other.y), Math.min(z, other.z));
}
public Vector3 round() public Vector3 round()
{ {
return new Vector3(Math.round(this.x), Math.round(this.y), Math.round(this.z)); return new Vector3(Math.round(this.x), Math.round(this.y), Math.round(this.z));
@ -457,6 +467,11 @@ public class Vector3 implements Cloneable
return worldObj.getEntitiesWithinAABB(par1Class, AxisAlignedBB.getBoundingBox(this.intX(), this.intY(), this.intZ(), this.intX() + 1, this.intY() + 1, this.intZ() + 1)); return worldObj.getEntitiesWithinAABB(par1Class, AxisAlignedBB.getBoundingBox(this.intX(), this.intY(), this.intZ(), this.intX() + 1, this.intY() + 1, this.intZ() + 1));
} }
public Vector3 midPoint(Vector3 pos)
{
return new Vector3((x + pos.x) / 2, (y + pos.y) / 2, (z + pos.z) / 2);
}
/** /**
* Cross product functions * Cross product functions
* *