diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 638b0d7..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.classpath b/.classpath deleted file mode 100644 index 6d7587a..0000000 --- a/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index b83d222..f186880 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,9 @@ /target/ +.classpath +.settings/** +.project +/logs/ +dependency-reduced-pom.xml +/target/ + +/bin/ diff --git a/.project b/.project deleted file mode 100644 index 29e0502..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - AspectAlchemy - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 13b3428..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/pom.xml b/pom.xml index 496b58f..0e99217 100644 --- a/pom.xml +++ b/pom.xml @@ -1,38 +1,44 @@ - - 4.0.0 - com.gmail.sharpcastle33 - AspectAlchemy - 0.0.1-SNAPSHOT - Aspect Alchemy - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - - - - org.spigotmc - spigot-api - 1.12-R0.1-SNAPSHOT - - + + 4.0.0 + com.gmail.sharpcastle33 + AspectAlchemy + 1.12 + Aspect Alchemy + + + UTF-8 + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/groups/public/ + + + + + + org.spigotmc + spigot-api + 1.12-R0.1-SNAPSHOT + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.1 + + 1.8 + 1.8 + + + + - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.1 - - 1.8 - 1.8 - - - - - diff --git a/src/main/java/com/gmail/sharpcastle33/aspects/AspectItemData.java b/src/main/java/com/gmail/sharpcastle33/aspects/AspectItemData.java index d253973..1f48589 100644 --- a/src/main/java/com/gmail/sharpcastle33/aspects/AspectItemData.java +++ b/src/main/java/com/gmail/sharpcastle33/aspects/AspectItemData.java @@ -13,7 +13,7 @@ public class AspectItemData { public AspectItemData(String name, String displayName, Map aspects) { this.configName = name; - this.displayName = displayName.replace('&', '§'); + this.displayName = displayName.replace('&', '§'); this.aspects = aspects; } diff --git a/src/main/java/com/gmail/sharpcastle33/aspects/AspectManager.java b/src/main/java/com/gmail/sharpcastle33/aspects/AspectManager.java index 4bd069e..8a8e08d 100644 --- a/src/main/java/com/gmail/sharpcastle33/aspects/AspectManager.java +++ b/src/main/java/com/gmail/sharpcastle33/aspects/AspectManager.java @@ -3,10 +3,8 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import java.util.List; import org.bukkit.Bukkit; -import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d694457..a2b3125 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ -name: Alchemy -version: 1.12 +name: ${project.name} +version: ${project.version} author: bms_ main: com.gmail.sharpcastle33.AspectAlchemy commands: @@ -14,4 +14,4 @@ commands: usage: /listpots gettools: description: (DEBUG) Gets all debug admin tools - usage: /gettools \ No newline at end of file + usage: /gettools diff --git a/target/.gitignore b/target/.gitignore deleted file mode 100644 index 840e7d3..0000000 --- a/target/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/classes/ diff --git a/target/AspectAlchemy-0.0.1-SNAPSHOT.jar b/target/AspectAlchemy-0.0.1-SNAPSHOT.jar deleted file mode 100644 index 81813b6..0000000 Binary files a/target/AspectAlchemy-0.0.1-SNAPSHOT.jar and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/aspects/Aspect.class b/target/classes/com/gmail/sharpcastle33/aspects/Aspect.class deleted file mode 100644 index 34de482..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/aspects/Aspect.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/aspects/AspectManager.class b/target/classes/com/gmail/sharpcastle33/aspects/AspectManager.class deleted file mode 100644 index 3435f6d..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/aspects/AspectManager.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/aspects/AspectRecipe.class b/target/classes/com/gmail/sharpcastle33/aspects/AspectRecipe.class deleted file mode 100644 index 2505939..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/aspects/AspectRecipe.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/aspects/AspectRecipeManager.class b/target/classes/com/gmail/sharpcastle33/aspects/AspectRecipeManager.class deleted file mode 100644 index e7d5b65..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/aspects/AspectRecipeManager.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/handlers/AlembicHandler.class b/target/classes/com/gmail/sharpcastle33/handlers/AlembicHandler.class deleted file mode 100644 index 15093cb..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/handlers/AlembicHandler.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/listeners/AlembicBreakListener.class b/target/classes/com/gmail/sharpcastle33/listeners/AlembicBreakListener.class deleted file mode 100644 index bf17a59..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/listeners/AlembicBreakListener.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/listeners/AlembicCreationListener.class b/target/classes/com/gmail/sharpcastle33/listeners/AlembicCreationListener.class deleted file mode 100644 index d8941dc..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/listeners/AlembicCreationListener.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/listeners/AlembicGUI.class b/target/classes/com/gmail/sharpcastle33/listeners/AlembicGUI.class deleted file mode 100644 index 1cfe6f9..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/listeners/AlembicGUI.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/potions/CustomPotion.class b/target/classes/com/gmail/sharpcastle33/potions/CustomPotion.class deleted file mode 100644 index dfdbc5f..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/potions/CustomPotion.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/potions/PotionManager.class b/target/classes/com/gmail/sharpcastle33/potions/PotionManager.class deleted file mode 100644 index 3eca441..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/potions/PotionManager.class and /dev/null differ diff --git a/target/classes/com/gmail/sharpcastle33/util/InventoryUtil.class b/target/classes/com/gmail/sharpcastle33/util/InventoryUtil.class deleted file mode 100644 index dfb8486..0000000 Binary files a/target/classes/com/gmail/sharpcastle33/util/InventoryUtil.class and /dev/null differ diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml deleted file mode 100644 index d694457..0000000 --- a/target/classes/plugin.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Alchemy -version: 1.12 -author: bms_ -main: com.gmail.sharpcastle33.AspectAlchemy -commands: - getpotion: - description: (DEBUG) Gets a potion from AspectAlchemy - usage: /getpotion - getrecipe: - description: (DEBUG) Gets the minimum recipe for a potion from AspectAlchemy - usage: /getrecipe - listpots: - description: (DEBUG) Lists all potions loaded from the potions.yaml - usage: /listpots - gettools: - description: (DEBUG) Gets all debug admin tools - usage: /gettools \ No newline at end of file diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties deleted file mode 100644 index 91d0199..0000000 --- a/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Apr 04 16:59:53 EDT 2018 -version=0.0.1-SNAPSHOT -groupId=com.gmail.sharpcastle33 -artifactId=AspectAlchemy diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index bba8fa9..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,13 +0,0 @@ -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/aspects/Aspect.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/aspects/AspectRecipe.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/util/InventoryUtil.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/aspects/AspectManager.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/potions/CustomPotion.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/listeners/AlembicGUI.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/handlers/AlembicHandler.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/AspectAlchemy.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/potions/PotionManager.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/listeners/AlembicCreationListener.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/listeners/AlembicBreakListener.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/aspects/AspectRecipeManager.java -/Users/Stephen/Desktop/IntCompSci2 Workspace/AspectAlchemy/src/main/java/com/gmail/sharpcastle33/AlembicManager.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000