Minor Changes

This commit is contained in:
Jerom van der Sar 2012-11-27 17:00:18 +01:00
parent ea151d63e4
commit feaac20a5a
6 changed files with 16 additions and 21 deletions

1
.gitignore vendored
View file

@ -3,6 +3,7 @@
/dist/ /dist/
/build/ /build/
buildnumber.properties buildnumber.properties
appinfo.properties
# eclipse excludes (JeromSar) # eclipse excludes (JeromSar)
.project .project

View file

@ -71,13 +71,4 @@
nbproject/build-impl.xml file. nbproject/build-impl.xml file.
--> -->
<target name="-pre-jar">
<buildnumber file="buildnumber.properties" />
<propertyfile file="appinfo.properties">
<entry key="program.VERSION" default="0.0" />
<entry key="program.BUILDNUM" value="${build.number}" />
<entry key="program.BUILDDATE" type="date" value="now" pattern="MM/dd/yyyy hh:mm aa" />
</propertyfile>
<copy file="appinfo.properties" todir="${build.classes.dir}" />
</target>
</project> </project>

View file

@ -1,6 +1,6 @@
build.xml.data.CRC32=7bf70ec5 build.xml.data.CRC32=7bf70ec5
build.xml.script.CRC32=b1031e10 build.xml.script.CRC32=b1031e10
build.xml.stylesheet.CRC32=28e38971@1.44.1.45 build.xml.stylesheet.CRC32=28e38971@1.53.1.46
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=7bf70ec5 nbproject/build-impl.xml.data.CRC32=7bf70ec5

View file

@ -4,7 +4,7 @@ annotation.processing.processors.list=
annotation.processing.run.all.processors=true annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=TotalFreedomMod application.title=TotalFreedomMod
application.vendor=Michael application.vendor=Jerom
build.classes.dir=${build.dir}/classes build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
@ -27,14 +27,17 @@ dist.jar=${dist.dir}/TotalFreedomMod.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath= endorsed.classpath=
excludes= excludes=
file.reference.bukkit-1.4.5-R0.2.jar=C:\\Users\\Jerom\\Desktop\\Jerom\\Java\\Libaries\\bukkit-1.4.5-R0.2.jar
file.reference.craftbukkit-TF.jar=C:\\Users\\Jerom\\Desktop\\Jerom\\Java\\Libaries\\craftbukkit-TF.jar
includes=** includes=**
jar.archive.disabled=${jnlp.enabled} jar.archive.disabled=${jnlp.enabled}
jar.compress=false jar.compress=false
jar.index=${jnlp.enabled} jar.index=${jnlp.enabled}
javac.classpath=\ javac.classpath=\
${libs.CraftBukkit.classpath} ${file.reference.craftbukkit-TF.jar}:\
${file.reference.bukkit-1.4.5-R0.2.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchecked -Xlint:deprecation javac.compilerargs=
javac.deprecation=false javac.deprecation=false
javac.processorpath=\ javac.processorpath=\
${javac.classpath} ${javac.classpath}
@ -65,7 +68,7 @@ jnlp.signed=false
jnlp.signing= jnlp.signing=
jnlp.signing.alias= jnlp.signing.alias=
jnlp.signing.keystore= jnlp.signing.keystore=
main.class=totalfreedommod.TotalFreedomMod main.class=
manifest.file=manifest.mf manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false mkdist.disabled=false
@ -73,9 +76,9 @@ platform.active=default_platform
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir} ${build.classes.dir}
# Space-separated list of JVM arguments used when running the project # Space-separated list of JVM arguments used when running the project.
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
# or test-sys-prop.name=value to set system properties for unit tests): # To set system properties for unit tests define test-sys-prop.name=value:
run.jvmargs= run.jvmargs=
run.test.classpath=\ run.test.classpath=\
${javac.test.classpath}:\ ${javac.test.classpath}:\

View file

@ -15,9 +15,9 @@ import org.bukkit.World;
public class TFM_ProtectedArea implements Serializable public class TFM_ProtectedArea implements Serializable
{ {
private static final long serialVersionUID = -3270338811000937254L;
private static final long serialVersionUID = -3270338811000937254L; public static final double MAX_RADIUS = 50.0D;
public static final double MAX_RADIUS = 50.0D;
private static Map<String, TFM_ProtectedArea> protectedAreas = new HashMap<String, TFM_ProtectedArea>(); private static Map<String, TFM_ProtectedArea> protectedAreas = new HashMap<String, TFM_ProtectedArea>();
private final SerializableLocation center_location; private final SerializableLocation center_location;
private final double radius; private final double radius;

View file

@ -566,11 +566,11 @@ public class TFM_Util
if (admin_entry.isSeniorAdmin()) if (admin_entry.isSeniorAdmin())
{ {
return "a " + ChatColor.GOLD + "senior admin" + ChatColor.AQUA + "."; return "a " + ChatColor.GOLD + "Senior Admin" + ChatColor.AQUA + ".";
} }
else else
{ {
return "a " + ChatColor.RED + "super admin" + ChatColor.AQUA + "."; return "a " + ChatColor.RED + "Super Admin" + ChatColor.AQUA + ".";
} }
} }
} }