From 5daee8b5f183e1da0b447a9b763e6b7d87027e48 Mon Sep 17 00:00:00 2001
From: Charlie Wang <charlie.wang@uwaterloo.ca>
Date: Mon, 17 Aug 2015 13:22:29 -0400
Subject: [PATCH] fix plugin.yml main, remove netbeans cruft

---
 .gitignore           |   7 ++-
 manifest.mf          |   3 --
 nb-configuration.xml |  19 --------
 pom.xml              | 105 -------------------------------------------
 src/plugin.yml       |   4 +-
 5 files changed, 5 insertions(+), 133 deletions(-)
 delete mode 100644 manifest.mf
 delete mode 100644 nb-configuration.xml
 delete mode 100644 pom.xml

diff --git a/.gitignore b/.gitignore
index 5f886e6..3fd2336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-/target/
 *.jar
-/build/
-/dist/
-/server/
\ No newline at end of file
+/out/
+.idea
+*.iml
diff --git a/manifest.mf b/manifest.mf
deleted file mode 100644
index 328e8e5..0000000
--- a/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/nb-configuration.xml b/nb-configuration.xml
deleted file mode 100644
index c5bbdab..0000000
--- a/nb-configuration.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-        <org-netbeans-modules-javascript2-requirejs.enabled>true</org-netbeans-modules-javascript2-requirejs.enabled>
-    </properties>
-</project-shared-configuration>
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index a6c2b59..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>ca.gibstick</groupId>
-    <artifactId>DiscoSheep</artifactId>
-    <version>1.1.2</version>
-    <packaging>jar</packaging>
-    <repositories>
-        <repository>
-            <id>repo.oc.tc</id>
-            <url>http://repo.oc.tc/content/repositories/public/</url>
-        </repository>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>command-framework-bukkit</artifactId>
-            <version>0.5-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.8-R0.1-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <finalName>DiscoSheep</finalName>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>src/main/resources/</directory>
-                <includes>
-                    <include>plugin.yml</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <compilerArgs>
-                        <arg>-Xlint:deprecation</arg>
-                    </compilerArgs>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.3</version> 
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version> 
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.1</version> 
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>DiscoSheep</finalName>
-                            <useBaseVersion>true</useBaseVersion>
-                            <shadedClassifierName/>
-                            <outputDirectory>${project.basedir}</outputDirectory>
-                            <artifactSet>
-                                <includes>
-                                    <include>com.sk89q:command-framework-bukkit</include>
-                                </includes>
-                            </artifactSet>
-                            <generateUniqueDependencyReducedPom>false</generateUniqueDependencyReducedPom>
-                            <shadedArtifactAttached>true</shadedArtifactAttached> <!-- Makes Netbeans shut up -->
-                            <shadedClassifierName>shaded</shadedClassifierName> 		
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build> 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-    <name>DiscoSheep</name>
-</project>
\ No newline at end of file
diff --git a/src/plugin.yml b/src/plugin.yml
index 124a17e..04f9692 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,7 +1,7 @@
 name: DiscoSheep
-main: DiscoSheep
+main: me.cwang.discosheep.DiscoSheep
 authors: [Gibstick, RangerMauve]
-version: 1.2
+version: 2.0
 commands:
   ds:
     description: "Main DiscoSheep command"