From 44779db9b6964795de774fa08651f32423c315d5 Mon Sep 17 00:00:00 2001 From: Charlie Date: Thu, 31 Jul 2014 12:10:22 -0400 Subject: [PATCH] Screw Maven we're not using you anymore git subtree is all the rage for the younguns --- .gitignore | 5 +- manifest.mf | 3 + nbproject/build-impl.xml | 1414 +++++++++++++++++ nbproject/genfiles.properties | 8 + nbproject/project.properties | 106 ++ nbproject/project.xml | 15 + pom.xml | 105 -- .../ca/gibstick/discosheep/DiscoCommands.java | 0 .../ca/gibstick/discosheep/DiscoParty.java | 0 .../ca/gibstick/discosheep/DiscoSheep.java | 0 .../ca/gibstick/discosheep/GlobalEvents.java | 0 .../ca/gibstick/discosheep/PartyEvents.java | 0 src/main/resources/plugin.yml | 93 -- src/plugin.yml | 14 +- 14 files changed, 1557 insertions(+), 206 deletions(-) create mode 100644 manifest.mf create mode 100644 nbproject/build-impl.xml create mode 100644 nbproject/genfiles.properties create mode 100644 nbproject/project.properties create mode 100644 nbproject/project.xml delete mode 100644 pom.xml rename src/{main/java => }/ca/gibstick/discosheep/DiscoCommands.java (100%) rename src/{main/java => }/ca/gibstick/discosheep/DiscoParty.java (100%) rename src/{main/java => }/ca/gibstick/discosheep/DiscoSheep.java (100%) rename src/{main/java => }/ca/gibstick/discosheep/GlobalEvents.java (100%) rename src/{main/java => }/ca/gibstick/discosheep/PartyEvents.java (100%) delete mode 100644 src/main/resources/plugin.yml diff --git a/.gitignore b/.gitignore index a25a269..df7012f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ /target/ -*.jar \ No newline at end of file +*.jar +/nbproject/private/ +/build/ +/dist/ \ No newline at end of file diff --git a/manifest.mf b/manifest.mf new file mode 100644 index 0000000..328e8e5 --- /dev/null +++ b/manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +X-COMMENT: Main-Class will be added automatically by build + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml new file mode 100644 index 0000000..81188d9 --- /dev/null +++ b/nbproject/build-impl.xml @@ -0,0 +1,1414 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set java.dir + Must set java3.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties new file mode 100644 index 0000000..92b0466 --- /dev/null +++ b/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=bb0575df +build.xml.script.CRC32=3c820d0f +build.xml.stylesheet.CRC32=8064a381@1.74.2.48 +# 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=bb0575df +nbproject/build-impl.xml.script.CRC32=62bcc04e +nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48 diff --git a/nbproject/project.properties b/nbproject/project.properties new file mode 100644 index 0000000..4b42009 --- /dev/null +++ b/nbproject/project.properties @@ -0,0 +1,106 @@ +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.processors.list= +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +application.title=DiscoSheep +application.vendor=Charlie +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=4 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# Files in build.classes.dir which should be excluded from distribution jar +dist.archive.excludes= +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/DiscoSheep.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.bukkit-1.7.9-R0.2.jar=C:\\Users\\Charlie\\Documents\\code\\bukkit\\bukkit-1.7.9-R0.2.jar +file.reference.DiscoSheep-src=src +file.reference.main-java=lib/bukkit/src/main/java +file.reference.main-java-1=lib/bungee/src/main/java +file.reference.main-java-2=lib/core/src/main/java +includes=** +jar.archive.disabled=${jnlp.enabled} +jar.compress=true +jar.index=${jnlp.enabled} +java.dir=${file.reference.main-java} +java3.dir=${file.reference.main-java-2} +javac.classpath=\ + ${file.reference.bukkit-1.7.9-R0.2.jar} +# Space-separated list of extra javac options +javac.compilerargs=-Xlint:deprecated +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.8 +javac.target=1.8 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +jnlp.codebase.type=no.codebase +jnlp.descriptor=application +jnlp.enabled=false +jnlp.mixed.code=default +jnlp.offline-allowed=false +jnlp.signed=false +jnlp.signing= +jnlp.signing.alias= +jnlp.signing.keystore= +main.class= +# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed +manifest.custom.codebase= +# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions) +manifest.custom.permissions= +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false +platform.active=default_platform +project.license=mit +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. +# To set system properties for unit tests define test-sys-prop.name=value: +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=${file.reference.DiscoSheep-src} diff --git a/nbproject/project.xml b/nbproject/project.xml new file mode 100644 index 0000000..7b13501 --- /dev/null +++ b/nbproject/project.xml @@ -0,0 +1,15 @@ + + + org.netbeans.modules.java.j2seproject + + + DiscoSheep + + + + + + + + + diff --git a/pom.xml b/pom.xml deleted file mode 100644 index de20afd..0000000 --- a/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - 4.0.0 - ca.gibstick - DiscoSheep - 1.1.2 - jar - - - bukkit-repo - http://repo.bukkit.org/content/groups/public/ - - - repo.oc.tc - http://repo.oc.tc/content/repositories/public/ - - - - - org.bukkit - bukkit - provided - 1.7.9-R0.2 - - - com.sk89q - command-framework-bukkit - 0.5-SNAPSHOT - - - - DiscoSheep - src/main/java - - - . - true - src/main/resources/ - - plugin.yml - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - - -Xlint:deprecation - - - - - org.apache.maven.plugins - maven-source-plugin - 2.3 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - package - - shade - - - DiscoSheep - true - - ${project.basedir} - - - com.sk89q:command-framework-bukkit - - - false - true - shaded - - - - - - - - UTF-8 - 1.7 - 1.7 - - DiscoSheep - \ No newline at end of file diff --git a/src/main/java/ca/gibstick/discosheep/DiscoCommands.java b/src/ca/gibstick/discosheep/DiscoCommands.java similarity index 100% rename from src/main/java/ca/gibstick/discosheep/DiscoCommands.java rename to src/ca/gibstick/discosheep/DiscoCommands.java diff --git a/src/main/java/ca/gibstick/discosheep/DiscoParty.java b/src/ca/gibstick/discosheep/DiscoParty.java similarity index 100% rename from src/main/java/ca/gibstick/discosheep/DiscoParty.java rename to src/ca/gibstick/discosheep/DiscoParty.java diff --git a/src/main/java/ca/gibstick/discosheep/DiscoSheep.java b/src/ca/gibstick/discosheep/DiscoSheep.java similarity index 100% rename from src/main/java/ca/gibstick/discosheep/DiscoSheep.java rename to src/ca/gibstick/discosheep/DiscoSheep.java diff --git a/src/main/java/ca/gibstick/discosheep/GlobalEvents.java b/src/ca/gibstick/discosheep/GlobalEvents.java similarity index 100% rename from src/main/java/ca/gibstick/discosheep/GlobalEvents.java rename to src/ca/gibstick/discosheep/GlobalEvents.java diff --git a/src/main/java/ca/gibstick/discosheep/PartyEvents.java b/src/ca/gibstick/discosheep/PartyEvents.java similarity index 100% rename from src/main/java/ca/gibstick/discosheep/PartyEvents.java rename to src/ca/gibstick/discosheep/PartyEvents.java diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index 59a2f36..0000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: DiscoSheep -main: ca.gibstick.discosheep.DiscoSheep -authors: [Gibstick, RangerMauve] -version: 1.1.2 -commands: - #ds: - #description: "Main DiscoSheep command" - #usage: | - # [arguments] - #Use /ds help for more information - #To stop your party, use /ds stop. -permissions: - # If default is set to false, console will not have permission! - discosheep.*: - description: Permission node for all DiscoSheep commands - default: op - children: - discosheep.party: true - discosheep.admin: true - discosheep.party.*: - description: All permissions related to parties - defualt: op - children: - discosheep.party.me: true - discosheep.party.all: true - discosheep.party.fireworks: true - discosheep.party.other: true - discosheep.party.changeperiod: true - discosheep.party.spawnguests: true - discosheep.party.lightning: true - discosheep.admin.*: - description: Suggested permissions for administrators - default: op - children: - discosheep.admin.stopall: true - discosheep.admin.reload: true - discosheep.admin.changedefaults: true - discosheep.admin.saveconfig: true - discosheep.admin.toggleonjoin: true - discosheep.party.me: - description: Allows a player to have a party of one - default: op - discosheep.party.all: - description: Allows a player to call a server-wide party - default: op - discosheep.admin.stopall: - description: Allows a player to stop all parties on the server - default: op - discosheep.party.fireworks: - description: Allows a player to enable have parties with fireworks - default: op - discosheep.admin.reload: - description: Allows a player to reload settings from config.yml - default: op - discosheep.party.other: - description: Allows a player to call parties for other people, including themselves. - default: op - children: - discosheep.party.me: true - discosheep.party.changeperiod: - description: Allows a player to use the -p switch - default: op - discosheep.admin.changedefaults: - description: Allows a player to change the default settings - default: op - discosheep.admin.saveconfig: - description: Allows a player to save the config with current values set in memory - default: op - discosheep.party.onjoin: - description: Gives a player a disco party on join - default: false - discosheep.party.spawnguests: - description: Allow a player to spawn other mobs - default: op - discosheep.admin.toggleonjoin: - description: Allow a player to toggle party-on-join functionality (force disable) - default: op - discosheep.party.lightning: - description: Allow a player to use lightning for parties - default: op - # FOR BACKWARDS COMPAT FROM 1.1 TO 1.1.1 - discosheep.party: - children: - discosheep.party.me: true - discosheep.partyall: - children: - discosheep.party.all: true - discosheep.reload: - children: - discoshep.admin.reload: true - discosheep.stopall: - children: - discosheep.admin.stopall: true \ No newline at end of file diff --git a/src/plugin.yml b/src/plugin.yml index 7df59e8..59a2f36 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,14 +1,14 @@ name: DiscoSheep main: ca.gibstick.discosheep.DiscoSheep authors: [Gibstick, RangerMauve] -version: 1.1.1 +version: 1.1.2 commands: - ds: - description: "Main DiscoSheep command" - usage: | - [arguments] - Use /ds help for more information - To stop your party, use /ds stop. + #ds: + #description: "Main DiscoSheep command" + #usage: | + # [arguments] + #Use /ds help for more information + #To stop your party, use /ds stop. permissions: # If default is set to false, console will not have permission! discosheep.*: