3.1.10 release - fixed bukkit javadoc link. Added canarymod-1.8.0 and spigot-1.8.8.jar

build.properties

@@ -1 +1 @@
-scriptcraft-version=3.1.9
+scriptcraft-version=3.1.10

build.xml

@@ -11,8 +11,8 @@
   <property name="src.bukkit" location="src/main/java/bukkit"/>
 
   <!-- compiles against these libraries -->
-  <property name="lib.canary" location="target/lib/canarymod.jar"/>
+  <property name="lib.canary" location="lib/canarymod-1.8.0.jar"/>
-  <property name="lib.bukkit" location="lib/bukkit-1.7.10-R0.1-SNAPSHOT.jar"/>
+  <property name="lib.bukkit" location="lib/spigot-1.8.8.jar"/>
 
   <property name="build" location="target/classes"/>
   <property name="dist" location="target/" />
@@ -56,26 +56,7 @@
   </target>
 
 
-  <target name="get-canary" depends="init" description="Downloads canarymod jar" unless="canary.present">
+  <target name="compile-plugins" depends="init" description="compile canary plugin source">
-    <mkdir dir="target/lib/"/>
-    <get src="http://scriptcraftjs.org/download/latest/CanaryMod-1.8.0-1.2.1-SNAPSHOT-shaded.jar"
-	 maxtime="60"
-	 dest="target/lib/canarymod.jar"
-	 verbose="true"/>
-    <!--
-	wph 20150801 - CanaryMod is no longer being developed. Get the latest version from scriptcraftjs.org instead.
-    <get src="https://ci.visualillusionsent.net/job/CanaryMod/lastStableBuild/artifact/*zip*/archive.zip"
-	 maxtime="60"
-	 dest="target/canarymod.zip"
-	 verbose="true"/>
-    <unzip src="target/canarymod.zip"
-	   dest="target/lib">
-      <mapper type="glob" from="*.jar" to="canarymod.jar"/>
-    </unzip>
-    -->
-  </target>
-
-  <target name="compile-plugins" depends="init,get-canary" description="compile canary plugin source">
     <javac includeantruntime="false" 
            source="1.6" 
            target="1.6" 
@@ -90,10 +71,10 @@
     </javac>
   </target>
     
-  <target name="gendocs" depends="construct-ypgpm, construct-api-ref, get-canary" description="Generate API documentation">
+  <target name="gendocs" depends="construct-ypgpm, construct-api-ref" description="Generate API documentation">
   </target>
 
-  <target name="compile-docs" depends="init, get-canary">
+  <target name="compile-docs" depends="init">
     <javac includeantruntime="false" srcdir="src/docs/java" destdir="${build}">
       <classpath>
 	<pathelement path="${lib.canary}"/>
@@ -101,7 +82,7 @@
     </javac>
   </target>
 
-  <target name="generate-api-ref-entries" depends="copy-js,compile-docs,init,get-canary">
+  <target name="generate-api-ref-entries" depends="copy-js,compile-docs,init">
 
     <jscript src="src/docs/js/generateApiDocs.js" 
 	     out="${dist}/apiref.md" 
@@ -118,7 +99,7 @@
 
   </target>
 
-  <target name="gen-events-helper-canary" depends="compile-docs,init, get-canary">
+  <target name="gen-events-helper-canary" depends="compile-docs,init">
     <mkdir dir="${dist}/js/lib"/>
     <jscript src="src/docs/js/generateEventsHelper.js" 
 	     out="${dist}/js/lib/events-helper-canary.js" 
@@ -130,7 +111,7 @@
     </jscript>
   </target>
 
-  <target name="gen-events-helper-bukkit" depends="compile-docs,init,get-canary">
+  <target name="gen-events-helper-bukkit" depends="compile-docs,init">
     <mkdir dir="${dist}/js/lib"/>
     <jscript src="src/docs/js/generateEventsHelper.js" 
 	     out="${dist}/js/lib/events-helper-bukkit.js" 
@@ -165,7 +146,7 @@ Walter Higgins
    </concat>      
   </target>
   
-  <target name="gen-toc-apiref" depends="compile-docs,generate-api-ref-entries, init, get-canary" description="Generate Table of Contents for API Reference">
+  <target name="gen-toc-apiref" depends="compile-docs,generate-api-ref-entries, init" description="Generate Table of Contents for API Reference">
     <jscript src="src/docs/js/generateTOC.js" 
 	     out="${dist}/toc-apiref.md"  
 	     err="${dist}/gen-toc-error.log">
@@ -173,7 +154,7 @@ Walter Higgins
     </jscript>
   </target>
 
-  <target name="gen-toc-ypgpm" depends="compile-docs,init, get-canary" description="Generate Table of Contents for Young Programmers Guide">
+  <target name="gen-toc-ypgpm" depends="compile-docs,init" description="Generate Table of Contents for Young Programmers Guide">
     <jscript src="src/docs/js/generateTOC.js" 
 	     out="${dist}/toc-ypgpm.md" 
 	     err="${dist}/gen-ypgpm-error.log">

release-notes.md

@@ -1,5 +1,10 @@
 RELEASE NOTES
 =============
+
+3.1.10 Release (2015 08 16)
+---------------------------
+Bug fix: modules/bukkit/sounds.js now works (fixed for Bukkit/SpigotMC/Glowstone)
+
 3.1.9 Release (2015 08 01)
 --------------------------
 Bug fix: minigames/scoreboard.js module's updatePlayerScore() function did not work with latest version of CanaryMod. 

src/docs/js/generateEventsHelper.js

@@ -71,7 +71,7 @@ while ( ( entry = zis.nextEntry) != null) {
     if (canary){
       fname = fname.replace(/Hook$/,'');
     }
-    var javaDoc = canary ? 'https://ci.visualillusionsent.net/job/CanaryLib/javadoc/net/canarymod/hook/' : 'http://jd.bukkit.org/rb/apidocs/org/bukkit/event/';
+    var javaDoc = canary ? 'https://ci.visualillusionsent.net/job/CanaryLib/javadoc/net/canarymod/hook/' : 'https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/';
     var comment = [
       '/*********************',
       '### events.' + fname + '()',