diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index aecc12c9e..000000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 412eeda78..000000000 --- a/.gitattributes +++ /dev/null @@ -1,22 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 892de0f54..c41cc9e35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1 @@ -nbproject/ -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -nbactions.xml -nb-configuration.xml -nbproject\project.properties - -# Class Files # -*.class - -# Package Files # -*.jar -*.war -*.ear -/target +/target \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100755 index e69de29bb..000000000 diff --git a/build.xml b/build.xml deleted file mode 100755 index 73a427e33..000000000 --- a/build.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - Builds, tests, and runs the project Quests. - - - diff --git a/build/built-jar.properties b/build/built-jar.properties deleted file mode 100644 index 873fd7307..000000000 --- a/build/built-jar.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Mon, 05 Aug 2013 16:21:50 -0700 - - -C\:\\Users\\Alex\\Documents\\GitHub\\Quests= diff --git a/dist/.DS_Store b/dist/.DS_Store deleted file mode 100755 index 2d69392b8..000000000 Binary files a/dist/.DS_Store and /dev/null differ diff --git a/dist/README.TXT b/dist/README.TXT deleted file mode 100644 index d6bc517e0..000000000 --- a/dist/README.TXT +++ /dev/null @@ -1,32 +0,0 @@ -======================== -BUILD OUTPUT DESCRIPTION -======================== - -When you build an Java application project that has a main class, the IDE -automatically copies all of the JAR -files on the projects classpath to your projects dist/lib folder. The IDE -also adds each of the JAR files to the Class-Path element in the application -JAR files manifest file (MANIFEST.MF). - -To run the project from the command line, go to the dist folder and -type the following: - -java -jar "Quests.jar" - -To distribute this project, zip up the dist folder (including the lib folder) -and distribute the ZIP file. - -Notes: - -* If two JAR files on the project classpath have the same name, only the first -JAR file is copied to the lib folder. -* Only JAR files are copied to the lib folder. -If the classpath contains other types of files or folders, these files (folders) -are not copied. -* If a library on the projects classpath also has a Class-Path element -specified in the manifest,the content of the Class-Path element has to be on -the projects runtime path. -* To set a main class in a standard Java project, right-click the project node -in the Projects window and choose Properties. Then click Run and enter the -class name in the Main Class field. Alternatively, you can manually type the -class name in the manifest Main-Class element. diff --git a/dist/lib/Vault.jar b/dist/lib/Vault.jar deleted file mode 100644 index 87a799396..000000000 Binary files a/dist/lib/Vault.jar and /dev/null differ diff --git a/dist/lib/denizen-0.8.8-PRERELEASE.jar b/dist/lib/denizen-0.8.8-PRERELEASE.jar deleted file mode 100644 index 3113d04f5..000000000 Binary files a/dist/lib/denizen-0.8.8-PRERELEASE.jar and /dev/null differ diff --git a/dist/lib/mcMMO.jar b/dist/lib/mcMMO.jar deleted file mode 100644 index 0b9903901..000000000 Binary files a/dist/lib/mcMMO.jar and /dev/null differ diff --git a/manifest.mf b/manifest.mf deleted file mode 100755 index 328e8e5bc..000000000 --- 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/nbproject/.DS_Store b/nbproject/.DS_Store deleted file mode 100755 index 67fb84f8a..000000000 Binary files a/nbproject/.DS_Store and /dev/null differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100755 index 4d9c8e62e..000000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,1400 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.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 -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100755 index d8a2cd9d8..000000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=4e312887 -build.xml.script.CRC32=2fa1ab10 -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=4e312887 -nbproject/build-impl.xml.script.CRC32=96e642f9 -nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46 diff --git a/nbproject/private/config.properties b/nbproject/private/config.properties deleted file mode 100755 index e69de29bb..000000000 diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties deleted file mode 100755 index cb35e40eb..000000000 --- a/nbproject/private/private.properties +++ /dev/null @@ -1,6 +0,0 @@ -compile.on.save=true -do.depend=false -do.jar=true -javac.debug=true -javadoc.preview=true -user.properties.file=C:\\Users\\Alex\\AppData\\Roaming\\NetBeans\\7.2.1\\build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml deleted file mode 100755 index ef6fb2e16..000000000 --- a/nbproject/private/private.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100755 index 94f7adc12..000000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,96 +0,0 @@ -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=Quests -application.vendor=Alex -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} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/Quests.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.craftbukkit-1.6.2-R0.1.jar=lib/craftbukkit-1.6.2-R0.1.jar -file.reference.denizen-0.8.8-PRERELEASE.jar=lib\\denizen-0.8.8-PRERELEASE.jar -file.reference.EpicBossRecoded.jar=lib/EpicBossRecoded.jar -file.reference.mcMMO.jar=lib\\mcMMO.jar -file.reference.Vault.jar=lib/Vault.jar -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=false -jar.index=${jnlp.enabled} -javac.classpath=\ - ${file.reference.Vault.jar}:\ - ${libs.Bukkit.classpath}:\ - ${libs.CitizensAPI.classpath}:\ - ${file.reference.mcMMO.jar}:\ - ${file.reference.denizen-0.8.8-PRERELEASE.jar}:\ - ${file.reference.EpicBossRecoded.jar}:\ - ${file.reference.craftbukkit-1.6.2-R0.1.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -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= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -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. -# 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=src -test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100755 index 5935c7e49..000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - Quests - - - - - - - - - diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index e742895c0..000000000 Binary files a/src/.DS_Store and /dev/null differ diff --git a/src/main/java/me/blackvein/quests/ColorUtil.java b/src/main/java/me/blackvein/quests/ColorUtil.java index 0e201c370..65a189b60 100644 --- a/src/main/java/me/blackvein/quests/ColorUtil.java +++ b/src/main/java/me/blackvein/quests/ColorUtil.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import org.bukkit.ChatColor; diff --git a/src/main/java/me/blackvein/quests/EpicBossListener.java b/src/main/java/me/blackvein/quests/EpicBossListener.java index a41c267a6..3451a1803 100644 --- a/src/main/java/me/blackvein/quests/EpicBossListener.java +++ b/src/main/java/me/blackvein/quests/EpicBossListener.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import me.ThaH3lper.com.Api.BossDeathEvent; import org.bukkit.entity.Player; diff --git a/src/main/java/me/blackvein/quests/Event.java b/src/main/java/me/blackvein/quests/Event.java index d1bf0e617..1b8cea820 100644 --- a/src/main/java/me/blackvein/quests/Event.java +++ b/src/main/java/me/blackvein/quests/Event.java @@ -1,8 +1,8 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.io.File; import java.util.*; -import main.java.me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.ItemUtil; import org.bukkit.*; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/me/blackvein/quests/EventFactory.java b/src/main/java/me/blackvein/quests/EventFactory.java index a1b372044..aed1cb17f 100644 --- a/src/main/java/me/blackvein/quests/EventFactory.java +++ b/src/main/java/me/blackvein/quests/EventFactory.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.io.File; import java.util.Arrays; @@ -7,10 +7,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import main.java.me.blackvein.quests.prompts.ItemStackPrompt; -import main.java.me.blackvein.quests.util.CK; -import main.java.me.blackvein.quests.util.ItemUtil; -import main.java.me.blackvein.quests.util.Lang; +import me.blackvein.quests.prompts.ItemStackPrompt; +import me.blackvein.quests.util.CK; +import me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.Lang; import net.citizensnpcs.api.CitizensAPI; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/me/blackvein/quests/ItemData.java b/src/main/java/me/blackvein/quests/ItemData.java index f406cd03c..a7ec03fae 100644 --- a/src/main/java/me/blackvein/quests/ItemData.java +++ b/src/main/java/me/blackvein/quests/ItemData.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.util.HashMap; import java.util.Scanner; diff --git a/src/main/java/me/blackvein/quests/ItemUtil.java b/src/main/java/me/blackvein/quests/ItemUtil.java index 8285e6aee..abab0fbff 100644 --- a/src/main/java/me/blackvein/quests/ItemUtil.java +++ b/src/main/java/me/blackvein/quests/ItemUtil.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.util.LinkedList; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/me/blackvein/quests/NpcEffectThread.java b/src/main/java/me/blackvein/quests/NpcEffectThread.java index b3e158cb3..5ccb7b22b 100644 --- a/src/main/java/me/blackvein/quests/NpcEffectThread.java +++ b/src/main/java/me/blackvein/quests/NpcEffectThread.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.util.List; import net.citizensnpcs.api.npc.NPC; diff --git a/src/main/java/me/blackvein/quests/NpcListener.java b/src/main/java/me/blackvein/quests/NpcListener.java index aafe0311e..ecd9e7c73 100644 --- a/src/main/java/me/blackvein/quests/NpcListener.java +++ b/src/main/java/me/blackvein/quests/NpcListener.java @@ -1,8 +1,8 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.text.MessageFormat; import java.util.LinkedList; -import main.java.me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.ItemUtil; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCDeathEvent; import net.citizensnpcs.api.event.NPCRightClickEvent; diff --git a/src/main/java/me/blackvein/quests/PacketUtils.java b/src/main/java/me/blackvein/quests/PacketUtils.java index bd9a9a471..94235526a 100644 --- a/src/main/java/me/blackvein/quests/PacketUtils.java +++ b/src/main/java/me/blackvein/quests/PacketUtils.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import net.minecraft.server.v1_6_R2.Packet; import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; diff --git a/src/main/java/me/blackvein/quests/ParticleEffect.java b/src/main/java/me/blackvein/quests/ParticleEffect.java index fa9e3d398..92cee922e 100644 --- a/src/main/java/me/blackvein/quests/ParticleEffect.java +++ b/src/main/java/me/blackvein/quests/ParticleEffect.java @@ -1,6 +1,6 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; -import main.java.me.blackvein.quests.util.ReflectionUtil; +import me.blackvein.quests.util.ReflectionUtil; import net.minecraft.server.v1_6_R2.Packet63WorldParticles; import org.bukkit.Location; diff --git a/src/main/java/me/blackvein/quests/PlayerListener.java b/src/main/java/me/blackvein/quests/PlayerListener.java index 9feb52982..a0eef6797 100644 --- a/src/main/java/me/blackvein/quests/PlayerListener.java +++ b/src/main/java/me/blackvein/quests/PlayerListener.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.io.File; diff --git a/src/main/java/me/blackvein/quests/Quest.java b/src/main/java/me/blackvein/quests/Quest.java index d027c9464..51dd99d8b 100644 --- a/src/main/java/me/blackvein/quests/Quest.java +++ b/src/main/java/me/blackvein/quests/Quest.java @@ -1,9 +1,9 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import java.util.LinkedList; import java.util.List; -import main.java.me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.ItemUtil; import net.citizensnpcs.api.npc.NPC; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/src/main/java/me/blackvein/quests/QuestFactory.java b/src/main/java/me/blackvein/quests/QuestFactory.java index 0b1a739dc..b2cee570b 100644 --- a/src/main/java/me/blackvein/quests/QuestFactory.java +++ b/src/main/java/me/blackvein/quests/QuestFactory.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.io.File; import java.util.HashMap; @@ -6,12 +6,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import main.java.me.blackvein.quests.prompts.RequirementsPrompt; -import main.java.me.blackvein.quests.prompts.RewardsPrompt; -import main.java.me.blackvein.quests.prompts.StagesPrompt; -import main.java.me.blackvein.quests.util.CK; -import main.java.me.blackvein.quests.util.ItemUtil; -import main.java.me.blackvein.quests.util.Lang; +import me.blackvein.quests.prompts.RequirementsPrompt; +import me.blackvein.quests.prompts.RewardsPrompt; +import me.blackvein.quests.prompts.StagesPrompt; +import me.blackvein.quests.util.CK; +import me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.Lang; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import org.bukkit.ChatColor; diff --git a/src/main/java/me/blackvein/quests/QuestTaskTrigger.java b/src/main/java/me/blackvein/quests/QuestTaskTrigger.java index f3cfcaa33..9f5a1235a 100644 --- a/src/main/java/me/blackvein/quests/QuestTaskTrigger.java +++ b/src/main/java/me/blackvein/quests/QuestTaskTrigger.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.aufdemrand.denizen.scripts.containers.core.TaskScriptContainer; diff --git a/src/main/java/me/blackvein/quests/Quester.java b/src/main/java/me/blackvein/quests/Quester.java index db4ee0cdf..df0083683 100644 --- a/src/main/java/me/blackvein/quests/Quester.java +++ b/src/main/java/me/blackvein/quests/Quester.java @@ -1,10 +1,10 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.io.File; import java.util.*; import java.util.Map.Entry; import me.ThaH3lper.com.LoadBosses.LoadBoss; -import main.java.me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.ItemUtil; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import org.bukkit.ChatColor; diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java index a803a8745..5d74ac584 100644 --- a/src/main/java/me/blackvein/quests/Quests.java +++ b/src/main/java/me/blackvein/quests/Quests.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.io.File; import java.sql.Connection; @@ -22,9 +22,9 @@ import java.util.logging.Logger; import me.ThaH3lper.com.EpicBoss; import me.ThaH3lper.com.LoadBosses.LoadBoss; -import main.java.me.blackvein.quests.prompts.QuestAcceptPrompt; -import main.java.me.blackvein.quests.util.ItemUtil; -import main.java.me.blackvein.quests.util.Lang; +import me.blackvein.quests.prompts.QuestAcceptPrompt; +import me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.Lang; import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.citizensnpcs.api.CitizensAPI; diff --git a/src/main/java/me/blackvein/quests/ReflectionUtilities.java b/src/main/java/me/blackvein/quests/ReflectionUtilities.java index a67bb897e..2725e356e 100644 --- a/src/main/java/me/blackvein/quests/ReflectionUtilities.java +++ b/src/main/java/me/blackvein/quests/ReflectionUtilities.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.lang.reflect.Field; diff --git a/src/main/java/me/blackvein/quests/Stage.java b/src/main/java/me/blackvein/quests/Stage.java index 3a6566458..140f8ecd0 100644 --- a/src/main/java/me/blackvein/quests/Stage.java +++ b/src/main/java/me/blackvein/quests/Stage.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import java.util.ArrayList; import java.util.EnumMap; diff --git a/src/main/java/me/blackvein/quests/StageTimer.java b/src/main/java/me/blackvein/quests/StageTimer.java index 358e22e6e..dc31369b6 100644 --- a/src/main/java/me/blackvein/quests/StageTimer.java +++ b/src/main/java/me/blackvein/quests/StageTimer.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests; +package me.blackvein.quests; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java b/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java index 3ecffa28e..1881e4340 100644 --- a/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/CreateStagePrompt.java @@ -1,17 +1,17 @@ -package main.java.me.blackvein.quests.prompts; +package me.blackvein.quests.prompts; import java.util.Arrays; import java.util.LinkedList; import java.util.List; import me.ThaH3lper.com.LoadBosses.LoadBoss; -import main.java.me.blackvein.quests.ColorUtil; -import main.java.me.blackvein.quests.Event; -import main.java.me.blackvein.quests.QuestFactory; -import main.java.me.blackvein.quests.Quester; -import main.java.me.blackvein.quests.Quests; -import main.java.me.blackvein.quests.util.CK; -import main.java.me.blackvein.quests.util.ItemUtil; -import main.java.me.blackvein.quests.util.Lang; +import me.blackvein.quests.ColorUtil; +import me.blackvein.quests.Event; +import me.blackvein.quests.QuestFactory; +import me.blackvein.quests.Quester; +import me.blackvein.quests.Quests; +import me.blackvein.quests.util.CK; +import me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.Lang; import net.aufdemrand.denizen.scripts.ScriptRegistry; import net.citizensnpcs.api.CitizensPlugin; import org.bukkit.Location; diff --git a/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java b/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java index b0ae01d9e..8ee2ccc70 100644 --- a/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java @@ -1,15 +1,15 @@ -package main.java.me.blackvein.quests.prompts; +package me.blackvein.quests.prompts; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import main.java.me.blackvein.quests.ColorUtil; -import main.java.me.blackvein.quests.ItemData; -import main.java.me.blackvein.quests.ItemData.Data; -import main.java.me.blackvein.quests.Quester; -import main.java.me.blackvein.quests.Quests; +import me.blackvein.quests.ColorUtil; +import me.blackvein.quests.ItemData; +import me.blackvein.quests.ItemData.Data; +import me.blackvein.quests.Quester; +import me.blackvein.quests.Quests; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.conversations.ConversationContext; diff --git a/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java b/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java index c2ad4cf30..6788d2266 100644 --- a/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java @@ -1,11 +1,11 @@ -package main.java.me.blackvein.quests.prompts; +package me.blackvein.quests.prompts; import java.text.MessageFormat; import java.util.LinkedList; -import main.java.me.blackvein.quests.ColorUtil; -import main.java.me.blackvein.quests.Quest; -import main.java.me.blackvein.quests.Quester; -import main.java.me.blackvein.quests.Quests; +import me.blackvein.quests.ColorUtil; +import me.blackvein.quests.Quest; +import me.blackvein.quests.Quester; +import me.blackvein.quests.Quests; import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; import org.bukkit.conversations.Conversable; diff --git a/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java b/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java index 60a9ae6b2..0de759e73 100644 --- a/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/RequirementsPrompt.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests.prompts; +package me.blackvein.quests.prompts; import java.util.Arrays; import java.util.Collections; @@ -6,13 +6,13 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; -import main.java.me.blackvein.quests.ColorUtil; -import main.java.me.blackvein.quests.Quest; -import main.java.me.blackvein.quests.QuestFactory; -import main.java.me.blackvein.quests.Quests; -import main.java.me.blackvein.quests.util.CK; -import main.java.me.blackvein.quests.util.ItemUtil; -import main.java.me.blackvein.quests.util.Lang; +import me.blackvein.quests.ColorUtil; +import me.blackvein.quests.Quest; +import me.blackvein.quests.QuestFactory; +import me.blackvein.quests.Quests; +import me.blackvein.quests.util.CK; +import me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.Lang; import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.FixedSetPrompt; diff --git a/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java b/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java index d722a2647..ac05bc4ce 100644 --- a/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java @@ -1,15 +1,15 @@ -package main.java.me.blackvein.quests.prompts; +package me.blackvein.quests.prompts; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import main.java.me.blackvein.quests.ColorUtil; -import main.java.me.blackvein.quests.QuestFactory; -import main.java.me.blackvein.quests.Quester; -import main.java.me.blackvein.quests.Quests; -import main.java.me.blackvein.quests.util.CK; -import main.java.me.blackvein.quests.util.ItemUtil; -import main.java.me.blackvein.quests.util.Lang; +import me.blackvein.quests.ColorUtil; +import me.blackvein.quests.QuestFactory; +import me.blackvein.quests.Quester; +import me.blackvein.quests.Quests; +import me.blackvein.quests.util.CK; +import me.blackvein.quests.util.ItemUtil; +import me.blackvein.quests.util.Lang; import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.FixedSetPrompt; import org.bukkit.conversations.NumericPrompt; diff --git a/src/main/java/me/blackvein/quests/prompts/StagesPrompt.java b/src/main/java/me/blackvein/quests/prompts/StagesPrompt.java index bddaec9e5..710e4f555 100644 --- a/src/main/java/me/blackvein/quests/prompts/StagesPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/StagesPrompt.java @@ -1,8 +1,8 @@ -package main.java.me.blackvein.quests.prompts; +package me.blackvein.quests.prompts; -import main.java.me.blackvein.quests.ColorUtil; -import main.java.me.blackvein.quests.QuestFactory; -import main.java.me.blackvein.quests.util.CK; +import me.blackvein.quests.ColorUtil; +import me.blackvein.quests.QuestFactory; +import me.blackvein.quests.util.CK; import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.Prompt; diff --git a/src/main/java/me/blackvein/quests/util/CK.java b/src/main/java/me/blackvein/quests/util/CK.java index 8bcbc69fa..23a7d420b 100644 --- a/src/main/java/me/blackvein/quests/util/CK.java +++ b/src/main/java/me/blackvein/quests/util/CK.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests.util; +package me.blackvein.quests.util; public class CK { diff --git a/src/main/java/me/blackvein/quests/util/ItemUtil.java b/src/main/java/me/blackvein/quests/util/ItemUtil.java index 6c25b7894..2d3b27e47 100644 --- a/src/main/java/me/blackvein/quests/util/ItemUtil.java +++ b/src/main/java/me/blackvein/quests/util/ItemUtil.java @@ -1,10 +1,10 @@ -package main.java.me.blackvein.quests.util; +package me.blackvein.quests.util; import java.util.LinkedList; import java.util.Map.Entry; -import main.java.me.blackvein.quests.ColorUtil; -import main.java.me.blackvein.quests.Quester; -import main.java.me.blackvein.quests.Quests; +import me.blackvein.quests.ColorUtil; +import me.blackvein.quests.Quester; +import me.blackvein.quests.Quests; import org.bukkit.ChatColor; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/blackvein/quests/util/Lang.java b/src/main/java/me/blackvein/quests/util/Lang.java index 71d54e67e..0f2af55ed 100644 --- a/src/main/java/me/blackvein/quests/util/Lang.java +++ b/src/main/java/me/blackvein/quests/util/Lang.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests.util; +package me.blackvein.quests.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/me/blackvein/quests/util/ReflectionUtil.java b/src/main/java/me/blackvein/quests/util/ReflectionUtil.java index 2ac55b909..7bb7df36e 100644 --- a/src/main/java/me/blackvein/quests/util/ReflectionUtil.java +++ b/src/main/java/me/blackvein/quests/util/ReflectionUtil.java @@ -1,4 +1,4 @@ -package main.java.me.blackvein.quests.util; +package me.blackvein.quests.util; import java.lang.reflect.Field;