Merge remote-tracking branch 'origin'
This commit is contained in:
@@ -115,6 +115,30 @@ subprojects {
|
||||
isIgnoreFailures = false
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType<Jar> {
|
||||
doLast {
|
||||
// sign jar
|
||||
if (System.getProperty("signKeyStore") != null) {
|
||||
// ensure ant is initialized so we can copy the project variable later
|
||||
ant.invokeMethod("echo", mapOf("message" to "initializing ant"))
|
||||
|
||||
for (file in outputs.files) {
|
||||
org.apache.tools.ant.taskdefs.SignJar().apply {
|
||||
// why is this required
|
||||
project = ant.project
|
||||
|
||||
setKeystore(System.getProperty("signKeyStore"))
|
||||
setStorepass(System.getProperty("signStorePass"))
|
||||
setAlias(System.getProperty("signAlias"))
|
||||
setJar(file)
|
||||
setSignedjar(file)
|
||||
execute()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
configure<PublishingExtension> {
|
||||
repositories {
|
||||
|
||||
@@ -1894,6 +1894,16 @@ public interface Client extends GameEngine
|
||||
*/
|
||||
int getOculusOrbFocalPointY();
|
||||
|
||||
/**
|
||||
* Sets local X coord where the camera is pointing when the Oculus orb is active
|
||||
*/
|
||||
void setOculusOrbFocalPointX(int xPos);
|
||||
|
||||
/**
|
||||
* Sets local Y coord where the camera is pointing when the Oculus orb is active
|
||||
*/
|
||||
void setOculusOrbFocalPointY(int yPos);
|
||||
|
||||
/**
|
||||
* Opens in-game world hopper interface
|
||||
*/
|
||||
|
||||
@@ -880,6 +880,14 @@ public interface RSClient extends RSGameEngine, Client
|
||||
@Override
|
||||
int getOculusOrbFocalPointY();
|
||||
|
||||
@Import("oculusOrbFocalPointX")
|
||||
@Override
|
||||
void setOculusOrbFocalPointX(int state);
|
||||
|
||||
@Import("oculusOrbFocalPointY")
|
||||
@Override
|
||||
void setOculusOrbFocalPointY(int state);
|
||||
|
||||
RSTileItem getLastItemDespawn();
|
||||
|
||||
void setLastItemDespawn(RSTileItem lastItemDespawn);
|
||||
|
||||
Reference in New Issue
Block a user