From feaac20a5a3b87c022fc05d232aba6c2d959cc72 Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Tue, 27 Nov 2012 17:00:18 +0100 Subject: [PATCH] Minor Changes --- .gitignore | 1 + build.xml | 9 --------- nbproject/genfiles.properties | 2 +- nbproject/project.properties | 17 ++++++++++------- .../TotalFreedomMod/TFM_ProtectedArea.java | 4 ++-- .../StevenLawson/TotalFreedomMod/TFM_Util.java | 4 ++-- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index d9bf3150..9abe1582 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /dist/ /build/ buildnumber.properties +appinfo.properties # eclipse excludes (JeromSar) .project diff --git a/build.xml b/build.xml index 41876061..14ce5c6f 100644 --- a/build.xml +++ b/build.xml @@ -71,13 +71,4 @@ nbproject/build-impl.xml file. --> - - - - - - - - - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 947ef47f..932e837d 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,6 +1,6 @@ build.xml.data.CRC32=7bf70ec5 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. # 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 diff --git a/nbproject/project.properties b/nbproject/project.properties index 276473c3..bc9f8125 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -4,7 +4,7 @@ annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=TotalFreedomMod -application.vendor=Michael +application.vendor=Jerom build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # 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 endorsed.classpath= 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=** jar.archive.disabled=${jnlp.enabled} jar.compress=false jar.index=${jnlp.enabled} 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 -javac.compilerargs=-Xlint:unchecked -Xlint:deprecation +javac.compilerargs= javac.deprecation=false javac.processorpath=\ ${javac.classpath} @@ -65,7 +68,7 @@ jnlp.signed=false jnlp.signing= jnlp.signing.alias= jnlp.signing.keystore= -main.class=totalfreedommod.TotalFreedomMod +main.class= manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false @@ -73,9 +76,9 @@ platform.active=default_platform run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} -# 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 -# or test-sys-prop.name=value to set system properties for unit tests): +# 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. +# To set system properties for unit tests define test-sys-prop.name=value: run.jvmargs= run.test.classpath=\ ${javac.test.classpath}:\ diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java index 3bae4181..9c1b1ed6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ProtectedArea.java @@ -15,9 +15,9 @@ import org.bukkit.World; 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 protectedAreas = new HashMap(); private final SerializableLocation center_location; private final double radius; diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index f497ff2d..db0aa7d5 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -566,11 +566,11 @@ public class TFM_Util if (admin_entry.isSeniorAdmin()) { - return "a " + ChatColor.GOLD + "senior admin" + ChatColor.AQUA + "."; + return "a " + ChatColor.GOLD + "Senior Admin" + ChatColor.AQUA + "."; } else { - return "a " + ChatColor.RED + "super admin" + ChatColor.AQUA + "."; + return "a " + ChatColor.RED + "Super Admin" + ChatColor.AQUA + "."; } } }