Updated redist, and Reorginized Textures.

This commit is contained in:
Zachary Daltorio
2013-09-30 18:31:56 -04:00
parent 90122d6700
commit 597699630d
42 changed files with 218 additions and 76 deletions

177
module_divine_weaponary.xml Normal file
View File

@@ -0,0 +1,177 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="module_divine_weaponary" default="compile.module.divine_weaponary">
<dirname property="module.divine_weaponary.basedir" file="${ant.file.module_divine_weaponary}"/>
<property name="module.jdk.home.divine_weaponary" value="${project.jdk.home}"/>
<property name="module.jdk.bin.divine_weaponary" value="${project.jdk.bin}"/>
<property name="module.jdk.classpath.divine_weaponary" value="${project.jdk.classpath}"/>
<property name="compiler.args.divine_weaponary" value="${compiler.args}"/>
<property name="divine_weaponary.output.dir" value="${module.divine_weaponary.basedir}/../../out/production/Divine Weaponary"/>
<property name="divine_weaponary.testoutput.dir" value="${module.divine_weaponary.basedir}/../../out/test/Divine Weaponary"/>
<path id="divine_weaponary.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>
<path id="divine_weaponary.module.production.classpath">
<path refid="${module.jdk.classpath.divine_weaponary}"/>
<pathelement location="${basedir}/forge/mcp/jars/versions/1.6.4/1.6.4.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
</path>
<path id="divine_weaponary.runtime.production.module.classpath">
<pathelement location="${divine_weaponary.output.dir}"/>
<pathelement location="${basedir}/forge/mcp/jars/versions/1.6.4/1.6.4.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
</path>
<path id="divine_weaponary.module.classpath">
<path refid="${module.jdk.classpath.divine_weaponary}"/>
<pathelement location="${divine_weaponary.output.dir}"/>
<pathelement location="${basedir}/forge/mcp/jars/versions/1.6.4/1.6.4.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
</path>
<path id="divine_weaponary.runtime.module.classpath">
<pathelement location="${divine_weaponary.testoutput.dir}"/>
<pathelement location="${divine_weaponary.output.dir}"/>
<pathelement location="${basedir}/forge/mcp/jars/versions/1.6.4/1.6.4.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
<pathelement location="${basedir}/forge/mcp/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
</path>
<patternset id="excluded.from.module.divine_weaponary">
<patternset refid="ignored.files"/>
</patternset>
<patternset id="excluded.from.module.minecaft">
<patternset refid="ignored.files"/>
</patternset>
<patternset id="excluded.from.compilation.divine_weaponary">
<patternset refid="excluded.from.module.divine_weaponary"/>
<patternset refid="excluded.from.module.minecaft"/>
</patternset>
<path id="divine_weaponary.module.sourcepath">
<dirset dir="${module.divine_weaponary.basedir}">
<include name="src"/>
</dirset>
<dirset dir="${module.divine_weaponary.basedir}/../../forge/mcp/src">
<include name="minecraft"/>
</dirset>
</path>
<target name="compile.module.divine_weaponary" depends="compile.module.divine_weaponary.production,compile.module.divine_weaponary.tests" description="Compile modules Divine Weaponary"/>
<target name="compile.module.divine_weaponary.production" depends="register.custom.compilers" description="Compile modules Divine Weaponary; production classes">
<mkdir dir="${divine_weaponary.output.dir}"/>
<javac2 destdir="${divine_weaponary.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.divine_weaponary}/javac">
<compilerarg line="${compiler.args.divine_weaponary}"/>
<bootclasspath refid="divine_weaponary.module.bootclasspath"/>
<classpath refid="divine_weaponary.module.production.classpath"/>
<src refid="divine_weaponary.module.sourcepath"/>
<patternset refid="excluded.from.compilation.divine_weaponary"/>
</javac2>
<copy todir="${divine_weaponary.output.dir}">
<fileset dir="${module.divine_weaponary.basedir}/src">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
<fileset dir="${module.divine_weaponary.basedir}/../../forge/mcp/src/minecraft">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="compile.module.divine_weaponary.tests" depends="register.custom.compilers,compile.module.divine_weaponary.production" description="compile modules Divine Weaponary; test classes" unless="skip.tests"/>
<target name="clean.module.divine_weaponary" description="cleanup module">
<delete dir="${divine_weaponary.output.dir}"/>
<delete dir="${divine_weaponary.testoutput.dir}"/>
</target>
</project>