diff options
| author | fatpigsarefat <fatpigsarefat@outlook.com> | 2018-07-21 21:25:00 +0100 |
|---|---|---|
| committer | fatpigsarefat <fatpigsarefat@outlook.com> | 2018-07-21 21:25:01 +0100 |
| commit | bcd4d141c04768c2ed3d00d4963e4f40424b5bc4 (patch) | |
| tree | b79a965aaa19bee8f859f1de5272feae2fbb0153 | |
| parent | 56aae6d737aa523f23160256b5022b8cce8fe9c5 (diff) | |
Now using Maven
- pom.xml was added
- Source files moved
- .gitignore adjusted to allow .xml
- All Title classes changed to use Bukkit method instead
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | pom.xml | 113 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/Quests.java (renamed from src/me/fatpigsarefat/quests/Quests.java) | 28 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/blocktype/Block.java (renamed from src/me/fatpigsarefat/quests/blocktype/Block.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/blocktype/SimilarBlocks.java (renamed from src/me/fatpigsarefat/quests/blocktype/SimilarBlocks.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/bstats/Metrics.java (renamed from src/me/fatpigsarefat/quests/bstats/Metrics.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/commands/CommandQuests.java (renamed from src/me/fatpigsarefat/quests/commands/CommandQuests.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/events/EventInventory.java (renamed from src/me/fatpigsarefat/quests/events/EventInventory.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/events/EventPlayerJoin.java (renamed from src/me/fatpigsarefat/quests/events/EventPlayerJoin.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/events/EventPlayerLeave.java (renamed from src/me/fatpigsarefat/quests/events/EventPlayerLeave.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/Items.java (renamed from src/me/fatpigsarefat/quests/obj/Items.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/Messages.java (renamed from src/me/fatpigsarefat/quests/obj/Messages.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/Options.java (renamed from src/me/fatpigsarefat/quests/obj/Options.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/misc/QItemStack.java (renamed from src/me/fatpigsarefat/quests/obj/misc/QItemStack.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/misc/QMenu.java (renamed from src/me/fatpigsarefat/quests/obj/misc/QMenu.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuCategory.java (renamed from src/me/fatpigsarefat/quests/obj/misc/QMenuCategory.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuDaily.java (renamed from src/me/fatpigsarefat/quests/obj/misc/QMenuDaily.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuQuest.java (renamed from src/me/fatpigsarefat/quests/obj/misc/QMenuQuest.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/obj/misc/creator/QMenuCreator.java (renamed from src/me/fatpigsarefat/quests/obj/misc/creator/QMenuCreator.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/player/QPlayer.java (renamed from src/me/fatpigsarefat/quests/player/QPlayer.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/player/QPlayerManager.java (renamed from src/me/fatpigsarefat/quests/player/QPlayerManager.java) | 2 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/player/questprogressfile/QuestProgress.java (renamed from src/me/fatpigsarefat/quests/player/questprogressfile/QuestProgress.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/player/questprogressfile/QuestProgressFile.java (renamed from src/me/fatpigsarefat/quests/player/questprogressfile/QuestProgressFile.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/player/questprogressfile/TaskProgress.java (renamed from src/me/fatpigsarefat/quests/player/questprogressfile/TaskProgress.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/Category.java (renamed from src/me/fatpigsarefat/quests/quests/Category.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/Quest.java (renamed from src/me/fatpigsarefat/quests/quests/Quest.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/QuestManager.java (renamed from src/me/fatpigsarefat/quests/quests/QuestManager.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/Task.java (renamed from src/me/fatpigsarefat/quests/quests/Task.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/TaskTypeManager.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/TaskTypeManager.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/FarmingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/FarmingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PlaytimeTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/PlaytimeTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PositionTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/PositionTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title.java (renamed from src/me/fatpigsarefat/quests/title/Title.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_Bukkit.java | 11 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_BukkitNoTimings.java | 13 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_Other.java (renamed from src/me/fatpigsarefat/quests/title/Title_Other.java) | 0 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_v1_10_R1.java | 22 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_v1_11_R1.java | 22 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_v1_12_R1.java | 22 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R1.java | 23 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R2.java | 22 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R3.java | 22 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_v1_9_R1.java | 22 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/title/Title_v1_9_R2.java | 22 | ||||
| -rw-r--r-- | src/main/java/me/fatpigsarefat/quests/updater/Updater.java (renamed from src/me/fatpigsarefat/quests/updater/Updater.java) | 0 | ||||
| -rw-r--r-- | src/main/resources/config.yml (renamed from src/config.yml) | 0 | ||||
| -rw-r--r-- | src/main/resources/plugin.yml (renamed from src/plugin.yml) | 5 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/title/Title_v1_10_R1.java | 22 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/title/Title_v1_11_R1.java | 22 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/title/Title_v1_12_R1.java | 22 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/title/Title_v1_8_R1.java | 23 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/title/Title_v1_8_R2.java | 22 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/title/Title_v1_8_R3.java | 22 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/title/Title_v1_9_R1.java | 22 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/title/Title_v1_9_R2.java | 22 |
72 files changed, 338 insertions, 189 deletions
@@ -2,5 +2,4 @@ out/ .idea/ test/ *.iml -*.xml .github/ diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..8becaf90 --- /dev/null +++ b/pom.xml @@ -0,0 +1,113 @@ +<?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>com.fatpigsarefat</groupId> + <artifactId>quests</artifactId> + <version>2.0.11</version> + <name>Quests</name> + + <properties> + <release.version>${version}-beta</release.version> + </properties> + + <repositories> + <!-- Spigot --> + <repository> + <id>spigot-repo</id> + <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> + </repository> + + <!-- ASkyBlock --> + <repository> + <id>bintray-tastybento-maven-repo</id> + <name>bintray</name> + <url>http://dl.bintray.com/tastybento/maven-repo</url> + </repository> + + <!-- uSkyBlock --> + <repository> + <id>uSkyBlock-mvn-repo</id> + <url>https://raw.github.com/rlf/uSkyBlock/mvn-repo/</url> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + </repository> + </repositories> + + <dependencies> + <!-- Spigot API --> + <dependency> + <groupId>org.spigotmc</groupId> + <artifactId>spigot-api</artifactId> + <version>1.12.2-R0.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <!-- ASkyBlock --> + <dependency> + <groupId>com.wasteofplastic</groupId> + <artifactId>askyblock</artifactId> + <version>LATEST</version> + <scope>provided</scope> + </dependency> + + <!-- uSkyBlock --> + <dependency> + <groupId>com.github.rlf</groupId> + <artifactId>uSkyBlock-API</artifactId> + <version>2.6.4</version> + </dependency> + </dependencies> + + <build> + <finalName>quests</finalName> + <sourceDirectory>src/main/java</sourceDirectory> + + <resources> + <resource> + <directory>${basedir}/src/main/resources/</directory> + <includes> + <include>*.yml</include> + </includes> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>8</source> + <target>8</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>replace</id> + <phase>prepare-package</phase> + <configuration> + <tasks> + <echo message="Bukkit plugin.yml version is: ${release.version}"/> + <replace token="%PLUGIN_VERSION%" value="${release.version}" dir="target/classes"> + <include name="**/*.yml"/> + </replace> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/src/me/fatpigsarefat/quests/Quests.java b/src/main/java/me/fatpigsarefat/quests/Quests.java index 1cb294b5..7904738b 100644 --- a/src/me/fatpigsarefat/quests/Quests.java +++ b/src/main/java/me/fatpigsarefat/quests/Quests.java @@ -386,34 +386,44 @@ public class Quests extends JavaPlugin { return false; } boolean success = false; - getLogger().info("Your server is running version " + version); + getLogger().info("Your server is running version " + version + "."); if (version.equals("v1_8_R3")) { - title = new Title_v1_8_R3(); + title = new Title_BukkitNoTimings(); success = true; } else if (version.equals("v1_8_R2")) { - title = new Title_v1_8_R2(); + title = new Title_BukkitNoTimings(); success = true; } else if (version.equals("v1_8_R1")) { - title = new Title_v1_8_R1(); + title = new Title_BukkitNoTimings(); success = true; } else if (version.equals("v1_9_R2")) { - title = new Title_v1_9_R2(); + title = new Title_BukkitNoTimings(); success = true; } else if (version.equals("v1_9_R1")) { - title = new Title_v1_9_R1(); + title = new Title_BukkitNoTimings(); success = true; } else if (version.equals("v1_10_R1")) { - title = new Title_v1_10_R1(); + title = new Title_BukkitNoTimings(); success = true; } else if (version.equals("v1_11_R1")) { - title = new Title_v1_11_R1(); + title = new Title_Bukkit(); success = true; } else if (version.equals("v1_12_R1")) { - title = new Title_v1_12_R1(); + title = new Title_Bukkit(); + success = true; + } else if (version.equals("v1_13_R1")) { + title = new Title_Bukkit(); success = true; } else { title = new Title_Other(); } + if (title instanceof Title_Bukkit) { + getLogger().info("Titles have been enabled."); + } else if (title instanceof Title_BukkitNoTimings) { + getLogger().info("Titles have been enabled, although they have limited timings."); + } else { + getLogger().info("Titles are not supported for this version."); + } return success; } diff --git a/src/me/fatpigsarefat/quests/blocktype/Block.java b/src/main/java/me/fatpigsarefat/quests/blocktype/Block.java index f9b61039..f9b61039 100644 --- a/src/me/fatpigsarefat/quests/blocktype/Block.java +++ b/src/main/java/me/fatpigsarefat/quests/blocktype/Block.java diff --git a/src/me/fatpigsarefat/quests/blocktype/SimilarBlocks.java b/src/main/java/me/fatpigsarefat/quests/blocktype/SimilarBlocks.java index 11b9f16d..11b9f16d 100644 --- a/src/me/fatpigsarefat/quests/blocktype/SimilarBlocks.java +++ b/src/main/java/me/fatpigsarefat/quests/blocktype/SimilarBlocks.java diff --git a/src/me/fatpigsarefat/quests/bstats/Metrics.java b/src/main/java/me/fatpigsarefat/quests/bstats/Metrics.java index 5a8a21b3..5a8a21b3 100644 --- a/src/me/fatpigsarefat/quests/bstats/Metrics.java +++ b/src/main/java/me/fatpigsarefat/quests/bstats/Metrics.java diff --git a/src/me/fatpigsarefat/quests/commands/CommandQuests.java b/src/main/java/me/fatpigsarefat/quests/commands/CommandQuests.java index 8c9baec7..8c9baec7 100644 --- a/src/me/fatpigsarefat/quests/commands/CommandQuests.java +++ b/src/main/java/me/fatpigsarefat/quests/commands/CommandQuests.java diff --git a/src/me/fatpigsarefat/quests/events/EventInventory.java b/src/main/java/me/fatpigsarefat/quests/events/EventInventory.java index 9911c216..9911c216 100644 --- a/src/me/fatpigsarefat/quests/events/EventInventory.java +++ b/src/main/java/me/fatpigsarefat/quests/events/EventInventory.java diff --git a/src/me/fatpigsarefat/quests/events/EventPlayerJoin.java b/src/main/java/me/fatpigsarefat/quests/events/EventPlayerJoin.java index 14062af0..14062af0 100644 --- a/src/me/fatpigsarefat/quests/events/EventPlayerJoin.java +++ b/src/main/java/me/fatpigsarefat/quests/events/EventPlayerJoin.java diff --git a/src/me/fatpigsarefat/quests/events/EventPlayerLeave.java b/src/main/java/me/fatpigsarefat/quests/events/EventPlayerLeave.java index 15d09a8e..15d09a8e 100644 --- a/src/me/fatpigsarefat/quests/events/EventPlayerLeave.java +++ b/src/main/java/me/fatpigsarefat/quests/events/EventPlayerLeave.java diff --git a/src/me/fatpigsarefat/quests/obj/Items.java b/src/main/java/me/fatpigsarefat/quests/obj/Items.java index 1ffeabc8..1ffeabc8 100644 --- a/src/me/fatpigsarefat/quests/obj/Items.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/Items.java diff --git a/src/me/fatpigsarefat/quests/obj/Messages.java b/src/main/java/me/fatpigsarefat/quests/obj/Messages.java index ddcb23cb..ddcb23cb 100644 --- a/src/me/fatpigsarefat/quests/obj/Messages.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/Messages.java diff --git a/src/me/fatpigsarefat/quests/obj/Options.java b/src/main/java/me/fatpigsarefat/quests/obj/Options.java index 920f1132..920f1132 100644 --- a/src/me/fatpigsarefat/quests/obj/Options.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/Options.java diff --git a/src/me/fatpigsarefat/quests/obj/misc/QItemStack.java b/src/main/java/me/fatpigsarefat/quests/obj/misc/QItemStack.java index 81cefc3b..81cefc3b 100644 --- a/src/me/fatpigsarefat/quests/obj/misc/QItemStack.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/misc/QItemStack.java diff --git a/src/me/fatpigsarefat/quests/obj/misc/QMenu.java b/src/main/java/me/fatpigsarefat/quests/obj/misc/QMenu.java index 13629600..13629600 100644 --- a/src/me/fatpigsarefat/quests/obj/misc/QMenu.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/misc/QMenu.java diff --git a/src/me/fatpigsarefat/quests/obj/misc/QMenuCategory.java b/src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuCategory.java index 61d1ac57..61d1ac57 100644 --- a/src/me/fatpigsarefat/quests/obj/misc/QMenuCategory.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuCategory.java diff --git a/src/me/fatpigsarefat/quests/obj/misc/QMenuDaily.java b/src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuDaily.java index 9b50f7ee..9b50f7ee 100644 --- a/src/me/fatpigsarefat/quests/obj/misc/QMenuDaily.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuDaily.java diff --git a/src/me/fatpigsarefat/quests/obj/misc/QMenuQuest.java b/src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuQuest.java index 50e264e7..50e264e7 100644 --- a/src/me/fatpigsarefat/quests/obj/misc/QMenuQuest.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/misc/QMenuQuest.java diff --git a/src/me/fatpigsarefat/quests/obj/misc/creator/QMenuCreator.java b/src/main/java/me/fatpigsarefat/quests/obj/misc/creator/QMenuCreator.java index 0436e203..0436e203 100644 --- a/src/me/fatpigsarefat/quests/obj/misc/creator/QMenuCreator.java +++ b/src/main/java/me/fatpigsarefat/quests/obj/misc/creator/QMenuCreator.java diff --git a/src/me/fatpigsarefat/quests/player/QPlayer.java b/src/main/java/me/fatpigsarefat/quests/player/QPlayer.java index e797d7bb..e797d7bb 100644 --- a/src/me/fatpigsarefat/quests/player/QPlayer.java +++ b/src/main/java/me/fatpigsarefat/quests/player/QPlayer.java diff --git a/src/me/fatpigsarefat/quests/player/QPlayerManager.java b/src/main/java/me/fatpigsarefat/quests/player/QPlayerManager.java index 29c6f01a..ef5e54b4 100644 --- a/src/me/fatpigsarefat/quests/player/QPlayerManager.java +++ b/src/main/java/me/fatpigsarefat/quests/player/QPlayerManager.java @@ -18,7 +18,7 @@ public class QPlayerManager { } public QPlayer getPlayer(UUID uuid) { - return qPlayers.getOrDefault(uuid, null); + return qPlayers.get(uuid); } public void removePlayer(UUID uuid) { diff --git a/src/me/fatpigsarefat/quests/player/questprogressfile/QuestProgress.java b/src/main/java/me/fatpigsarefat/quests/player/questprogressfile/QuestProgress.java index 97e0b517..97e0b517 100644 --- a/src/me/fatpigsarefat/quests/player/questprogressfile/QuestProgress.java +++ b/src/main/java/me/fatpigsarefat/quests/player/questprogressfile/QuestProgress.java diff --git a/src/me/fatpigsarefat/quests/player/questprogressfile/QuestProgressFile.java b/src/main/java/me/fatpigsarefat/quests/player/questprogressfile/QuestProgressFile.java index 144093e6..144093e6 100644 --- a/src/me/fatpigsarefat/quests/player/questprogressfile/QuestProgressFile.java +++ b/src/main/java/me/fatpigsarefat/quests/player/questprogressfile/QuestProgressFile.java diff --git a/src/me/fatpigsarefat/quests/player/questprogressfile/TaskProgress.java b/src/main/java/me/fatpigsarefat/quests/player/questprogressfile/TaskProgress.java index 3b896334..3b896334 100644 --- a/src/me/fatpigsarefat/quests/player/questprogressfile/TaskProgress.java +++ b/src/main/java/me/fatpigsarefat/quests/player/questprogressfile/TaskProgress.java diff --git a/src/me/fatpigsarefat/quests/quests/Category.java b/src/main/java/me/fatpigsarefat/quests/quests/Category.java index b17f6db7..b17f6db7 100644 --- a/src/me/fatpigsarefat/quests/quests/Category.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/Category.java diff --git a/src/me/fatpigsarefat/quests/quests/Quest.java b/src/main/java/me/fatpigsarefat/quests/quests/Quest.java index 0f0a3638..0f0a3638 100644 --- a/src/me/fatpigsarefat/quests/quests/Quest.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/Quest.java diff --git a/src/me/fatpigsarefat/quests/quests/QuestManager.java b/src/main/java/me/fatpigsarefat/quests/quests/QuestManager.java index 1ec6ea63..1ec6ea63 100644 --- a/src/me/fatpigsarefat/quests/quests/QuestManager.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/QuestManager.java diff --git a/src/me/fatpigsarefat/quests/quests/Task.java b/src/main/java/me/fatpigsarefat/quests/quests/Task.java index fb209145..fb209145 100644 --- a/src/me/fatpigsarefat/quests/quests/Task.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/Task.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java index d886fe16..d886fe16 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java index bb4ddea5..bb4ddea5 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/TaskTypeManager.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/TaskTypeManager.java index 163e128c..163e128c 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/TaskTypeManager.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/TaskTypeManager.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java index 5fcdda15..5fcdda15 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java index 5bda96c3..5bda96c3 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java index 0943ddf9..0943ddf9 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/FarmingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/FarmingTaskType.java index 1fff9703..1fff9703 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/FarmingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/FarmingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java index 87ce8147..87ce8147 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java index ab3c2af5..ab3c2af5 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java index 7de92d59..7de92d59 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java index 0199150e..0199150e 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java index f0ba95ca..f0ba95ca 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java index 1a026d5f..1a026d5f 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java index 8e0e5550..8e0e5550 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java index 6a9e7481..6a9e7481 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/PlaytimeTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PlaytimeTaskType.java index 6268b9de..6268b9de 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/PlaytimeTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PlaytimeTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/PositionTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PositionTaskType.java index 6702f732..6702f732 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/PositionTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/PositionTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java index 316c3e28..316c3e28 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java index beca3b4e..beca3b4e 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java index 5ddc2241..5ddc2241 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java index d140ab8f..d140ab8f 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java +++ b/src/main/java/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java diff --git a/src/me/fatpigsarefat/quests/title/Title.java b/src/main/java/me/fatpigsarefat/quests/title/Title.java index 4851440b..4851440b 100644 --- a/src/me/fatpigsarefat/quests/title/Title.java +++ b/src/main/java/me/fatpigsarefat/quests/title/Title.java diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_Bukkit.java b/src/main/java/me/fatpigsarefat/quests/title/Title_Bukkit.java new file mode 100644 index 00000000..0a39b2eb --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_Bukkit.java @@ -0,0 +1,11 @@ +package me.fatpigsarefat.quests.title; + +import org.bukkit.entity.Player; + +public class Title_Bukkit implements Title { + + @Override + public void sendTitle(Player player, String message, String submessage) { + player.sendTitle(message, submessage, 10, 100, 10); + } +} diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_BukkitNoTimings.java b/src/main/java/me/fatpigsarefat/quests/title/Title_BukkitNoTimings.java new file mode 100644 index 00000000..97fe6e02 --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_BukkitNoTimings.java @@ -0,0 +1,13 @@ +package me.fatpigsarefat.quests.title; + +import org.bukkit.entity.Player; + +public class Title_BukkitNoTimings implements Title { + + // this one is for 1.8, 1.9 and 1.10 where there was no timings method + @Override + public void sendTitle(Player player, String message, String submessage) { + player.sendTitle(message, submessage); + } + +} diff --git a/src/me/fatpigsarefat/quests/title/Title_Other.java b/src/main/java/me/fatpigsarefat/quests/title/Title_Other.java index eef4bc07..eef4bc07 100644 --- a/src/me/fatpigsarefat/quests/title/Title_Other.java +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_Other.java diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_v1_10_R1.java b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_10_R1.java new file mode 100644 index 00000000..0343ccbd --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_10_R1.java @@ -0,0 +1,22 @@ +//package me.fatpigsarefat.quests.title; +// +//import net.minecraft.server.v1_10_R1.IChatBaseComponent.ChatSerializer; +//import net.minecraft.server.v1_10_R1.PacketPlayOutTitle; +//import net.minecraft.server.v1_10_R1.PacketPlayOutTitle.EnumTitleAction; +//import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer; +//import org.bukkit.entity.Player; +// +//public class Title_v1_10_R1 implements Title { +// +// @Override +// public void sendTitle(Player player, String message, String submessage) { +// message = "{\"text\":\"" + message + "\"}"; +// PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, +// 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); +// submessage = "{\"text\":\"" + submessage + "\"}"; +// PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, +// 100, 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); +// } +//} diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_v1_11_R1.java b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_11_R1.java new file mode 100644 index 00000000..edb7e9e7 --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_11_R1.java @@ -0,0 +1,22 @@ +//package me.fatpigsarefat.quests.title; +// +//import net.minecraft.server.v1_11_R1.IChatBaseComponent.ChatSerializer; +//import net.minecraft.server.v1_11_R1.PacketPlayOutTitle; +//import net.minecraft.server.v1_11_R1.PacketPlayOutTitle.EnumTitleAction; +//import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer; +//import org.bukkit.entity.Player; +// +//public class Title_v1_11_R1 implements Title { +// +// @Override +// public void sendTitle(Player player, String message, String submessage) { +// message = "{\"text\":\"" + message + "\"}"; +// PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, +// 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); +// submessage = "{\"text\":\"" + submessage + "\"}"; +// PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, +// 100, 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); +// } +//} diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_v1_12_R1.java b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_12_R1.java new file mode 100644 index 00000000..daebefa3 --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_12_R1.java @@ -0,0 +1,22 @@ +//package me.fatpigsarefat.quests.title; +// +//import net.minecraft.server.v1_12_R1.IChatBaseComponent.ChatSerializer; +//import net.minecraft.server.v1_12_R1.PacketPlayOutTitle; +//import net.minecraft.server.v1_12_R1.PacketPlayOutTitle.EnumTitleAction; +//import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; +//import org.bukkit.entity.Player; +// +//public class Title_v1_12_R1 implements Title { +// +// @Override +// public void sendTitle(Player player, String message, String submessage) { +// message = "{\"text\":\"" + message + "\"}"; +// PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, +// 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); +// submessage = "{\"text\":\"" + submessage + "\"}"; +// PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, +// 100, 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); +// } +//} diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R1.java b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R1.java new file mode 100644 index 00000000..4de97c98 --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R1.java @@ -0,0 +1,23 @@ +//package me.fatpigsarefat.quests.title; +// +//import net.minecraft.server.v1_8_R1.ChatSerializer; +//import net.minecraft.server.v1_8_R1.EnumTitleAction; +//import net.minecraft.server.v1_8_R1.PacketPlayOutTitle; +//import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer; +//import org.bukkit.entity.Player; +// +//public class Title_v1_8_R1 implements Title { +// +// @Override +// public void sendTitle(Player player, String message, String submessage) { +// message = "{\"text\":\"" + message + "\"}"; +// PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, +// 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); +// submessage = "{\"text\":\"" + submessage + "\"}"; +// PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, +// 100, 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); +// } +// +//}
\ No newline at end of file diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R2.java b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R2.java new file mode 100644 index 00000000..acda3c70 --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R2.java @@ -0,0 +1,22 @@ +//package me.fatpigsarefat.quests.title; +// +//import net.minecraft.server.v1_8_R2.IChatBaseComponent.ChatSerializer; +//import net.minecraft.server.v1_8_R2.PacketPlayOutTitle; +//import net.minecraft.server.v1_8_R2.PacketPlayOutTitle.EnumTitleAction; +//import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; +//import org.bukkit.entity.Player; +// +//public class Title_v1_8_R2 implements Title { +// +// @Override +// public void sendTitle(Player player, String message, String submessage) { +// message = "{\"text\":\"" + message + "\"}"; +// PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, +// 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); +// submessage = "{\"text\":\"" + submessage + "\"}"; +// PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, +// 100, 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); +// } +//}
\ No newline at end of file diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R3.java b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R3.java new file mode 100644 index 00000000..0bc56b5f --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_8_R3.java @@ -0,0 +1,22 @@ +//package me.fatpigsarefat.quests.title; +// +//import net.minecraft.server.v1_8_R3.IChatBaseComponent.ChatSerializer; +//import net.minecraft.server.v1_8_R3.PacketPlayOutTitle; +//import net.minecraft.server.v1_8_R3.PacketPlayOutTitle.EnumTitleAction; +//import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; +//import org.bukkit.entity.Player; +// +//public class Title_v1_8_R3 implements Title { +// +// @Override +// public void sendTitle(Player player, String message, String submessage) { +// message = "{\"text\":\"" + message + "\"}"; +// PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, +// 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); +// submessage = "{\"text\":\"" + submessage + "\"}"; +// PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, +// 100, 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); +// } +//} diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_v1_9_R1.java b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_9_R1.java new file mode 100644 index 00000000..80e25392 --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_9_R1.java @@ -0,0 +1,22 @@ +//package me.fatpigsarefat.quests.title; +// +//import net.minecraft.server.v1_9_R1.IChatBaseComponent.ChatSerializer; +//import net.minecraft.server.v1_9_R1.PacketPlayOutTitle; +//import net.minecraft.server.v1_9_R1.PacketPlayOutTitle.EnumTitleAction; +//import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer; +//import org.bukkit.entity.Player; +// +//public class Title_v1_9_R1 implements Title { +// +// @Override +// public void sendTitle(Player player, String message, String submessage) { +// message = "{\"text\":\"" + message + "\"}"; +// PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, +// 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); +// submessage = "{\"text\":\"" + submessage + "\"}"; +// PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, +// 100, 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); +// } +//} diff --git a/src/main/java/me/fatpigsarefat/quests/title/Title_v1_9_R2.java b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_9_R2.java new file mode 100644 index 00000000..29b52bbd --- /dev/null +++ b/src/main/java/me/fatpigsarefat/quests/title/Title_v1_9_R2.java @@ -0,0 +1,22 @@ +//package me.fatpigsarefat.quests.title; +// +//import net.minecraft.server.v1_9_R2.IChatBaseComponent.ChatSerializer; +//import net.minecraft.server.v1_9_R2.PacketPlayOutTitle; +//import net.minecraft.server.v1_9_R2.PacketPlayOutTitle.EnumTitleAction; +//import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer; +//import org.bukkit.entity.Player; +// +//public class Title_v1_9_R2 implements Title { +// +// @Override +// public void sendTitle(Player player, String message, String submessage) { +// message = "{\"text\":\"" + message + "\"}"; +// PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, +// 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); +// submessage = "{\"text\":\"" + submessage + "\"}"; +// PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, +// 100, 10); +// ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); +// } +//} diff --git a/src/me/fatpigsarefat/quests/updater/Updater.java b/src/main/java/me/fatpigsarefat/quests/updater/Updater.java index 28cfde26..28cfde26 100644 --- a/src/me/fatpigsarefat/quests/updater/Updater.java +++ b/src/main/java/me/fatpigsarefat/quests/updater/Updater.java diff --git a/src/config.yml b/src/main/resources/config.yml index 70387b0e..70387b0e 100644 --- a/src/config.yml +++ b/src/main/resources/config.yml diff --git a/src/plugin.yml b/src/main/resources/plugin.yml index 65ab1a4c..acce45cf 100644 --- a/src/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,8 @@ name: Quests -version: 2.0.11-beta + +# This will be replaced with the property "release.version" in pom.xml upon build. +version: %PLUGIN_VERSION% + main: me.fatpigsarefat.quests.Quests author: fatpigsarefat softdepend: [ASkyBlock, uSkyBlock] diff --git a/src/me/fatpigsarefat/quests/title/Title_v1_10_R1.java b/src/me/fatpigsarefat/quests/title/Title_v1_10_R1.java deleted file mode 100644 index b91cdbfc..00000000 --- a/src/me/fatpigsarefat/quests/title/Title_v1_10_R1.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.fatpigsarefat.quests.title; - -import net.minecraft.server.v1_10_R1.IChatBaseComponent.ChatSerializer; -import net.minecraft.server.v1_10_R1.PacketPlayOutTitle; -import net.minecraft.server.v1_10_R1.PacketPlayOutTitle.EnumTitleAction; -import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; - -public class Title_v1_10_R1 implements Title { - - @Override - public void sendTitle(Player player, String message, String submessage) { - message = "{\"text\":\"" + message + "\"}"; - PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, - 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); - submessage = "{\"text\":\"" + submessage + "\"}"; - PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, - 100, 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); - } -} diff --git a/src/me/fatpigsarefat/quests/title/Title_v1_11_R1.java b/src/me/fatpigsarefat/quests/title/Title_v1_11_R1.java deleted file mode 100644 index 1cb522e1..00000000 --- a/src/me/fatpigsarefat/quests/title/Title_v1_11_R1.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.fatpigsarefat.quests.title; - -import net.minecraft.server.v1_11_R1.IChatBaseComponent.ChatSerializer; -import net.minecraft.server.v1_11_R1.PacketPlayOutTitle; -import net.minecraft.server.v1_11_R1.PacketPlayOutTitle.EnumTitleAction; -import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; - -public class Title_v1_11_R1 implements Title { - - @Override - public void sendTitle(Player player, String message, String submessage) { - message = "{\"text\":\"" + message + "\"}"; - PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, - 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); - submessage = "{\"text\":\"" + submessage + "\"}"; - PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, - 100, 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); - } -} diff --git a/src/me/fatpigsarefat/quests/title/Title_v1_12_R1.java b/src/me/fatpigsarefat/quests/title/Title_v1_12_R1.java deleted file mode 100644 index 61a221fa..00000000 --- a/src/me/fatpigsarefat/quests/title/Title_v1_12_R1.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.fatpigsarefat.quests.title; - -import net.minecraft.server.v1_12_R1.IChatBaseComponent.ChatSerializer; -import net.minecraft.server.v1_12_R1.PacketPlayOutTitle; -import net.minecraft.server.v1_12_R1.PacketPlayOutTitle.EnumTitleAction; -import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; - -public class Title_v1_12_R1 implements Title { - - @Override - public void sendTitle(Player player, String message, String submessage) { - message = "{\"text\":\"" + message + "\"}"; - PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, - 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); - submessage = "{\"text\":\"" + submessage + "\"}"; - PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, - 100, 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); - } -} diff --git a/src/me/fatpigsarefat/quests/title/Title_v1_8_R1.java b/src/me/fatpigsarefat/quests/title/Title_v1_8_R1.java deleted file mode 100644 index e6c7dbcb..00000000 --- a/src/me/fatpigsarefat/quests/title/Title_v1_8_R1.java +++ /dev/null @@ -1,23 +0,0 @@ -package me.fatpigsarefat.quests.title; - -import net.minecraft.server.v1_8_R1.ChatSerializer; -import net.minecraft.server.v1_8_R1.EnumTitleAction; -import net.minecraft.server.v1_8_R1.PacketPlayOutTitle; -import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; - -public class Title_v1_8_R1 implements Title { - - @Override - public void sendTitle(Player player, String message, String submessage) { - message = "{\"text\":\"" + message + "\"}"; - PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, - 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); - submessage = "{\"text\":\"" + submessage + "\"}"; - PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, - 100, 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); - } - -}
\ No newline at end of file diff --git a/src/me/fatpigsarefat/quests/title/Title_v1_8_R2.java b/src/me/fatpigsarefat/quests/title/Title_v1_8_R2.java deleted file mode 100644 index 3e76e001..00000000 --- a/src/me/fatpigsarefat/quests/title/Title_v1_8_R2.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.fatpigsarefat.quests.title; - -import net.minecraft.server.v1_8_R2.IChatBaseComponent.ChatSerializer; -import net.minecraft.server.v1_8_R2.PacketPlayOutTitle; -import net.minecraft.server.v1_8_R2.PacketPlayOutTitle.EnumTitleAction; -import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; -import org.bukkit.entity.Player; - -public class Title_v1_8_R2 implements Title { - - @Override - public void sendTitle(Player player, String message, String submessage) { - message = "{\"text\":\"" + message + "\"}"; - PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, - 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); - submessage = "{\"text\":\"" + submessage + "\"}"; - PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, - 100, 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); - } -}
\ No newline at end of file diff --git a/src/me/fatpigsarefat/quests/title/Title_v1_8_R3.java b/src/me/fatpigsarefat/quests/title/Title_v1_8_R3.java deleted file mode 100644 index 933bd098..00000000 --- a/src/me/fatpigsarefat/quests/title/Title_v1_8_R3.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.fatpigsarefat.quests.title; - -import net.minecraft.server.v1_8_R3.IChatBaseComponent.ChatSerializer; -import net.minecraft.server.v1_8_R3.PacketPlayOutTitle; -import net.minecraft.server.v1_8_R3.PacketPlayOutTitle.EnumTitleAction; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; -import org.bukkit.entity.Player; - -public class Title_v1_8_R3 implements Title { - - @Override - public void sendTitle(Player player, String message, String submessage) { - message = "{\"text\":\"" + message + "\"}"; - PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, - 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); - submessage = "{\"text\":\"" + submessage + "\"}"; - PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, - 100, 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); - } -} diff --git a/src/me/fatpigsarefat/quests/title/Title_v1_9_R1.java b/src/me/fatpigsarefat/quests/title/Title_v1_9_R1.java deleted file mode 100644 index b42b4920..00000000 --- a/src/me/fatpigsarefat/quests/title/Title_v1_9_R1.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.fatpigsarefat.quests.title; - -import net.minecraft.server.v1_9_R1.IChatBaseComponent.ChatSerializer; -import net.minecraft.server.v1_9_R1.PacketPlayOutTitle; -import net.minecraft.server.v1_9_R1.PacketPlayOutTitle.EnumTitleAction; -import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; - -public class Title_v1_9_R1 implements Title { - - @Override - public void sendTitle(Player player, String message, String submessage) { - message = "{\"text\":\"" + message + "\"}"; - PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, - 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); - submessage = "{\"text\":\"" + submessage + "\"}"; - PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, - 100, 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); - } -} diff --git a/src/me/fatpigsarefat/quests/title/Title_v1_9_R2.java b/src/me/fatpigsarefat/quests/title/Title_v1_9_R2.java deleted file mode 100644 index 5f69ccfd..00000000 --- a/src/me/fatpigsarefat/quests/title/Title_v1_9_R2.java +++ /dev/null @@ -1,22 +0,0 @@ -package me.fatpigsarefat.quests.title; - -import net.minecraft.server.v1_9_R2.IChatBaseComponent.ChatSerializer; -import net.minecraft.server.v1_9_R2.PacketPlayOutTitle; -import net.minecraft.server.v1_9_R2.PacketPlayOutTitle.EnumTitleAction; -import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer; -import org.bukkit.entity.Player; - -public class Title_v1_9_R2 implements Title { - - @Override - public void sendTitle(Player player, String message, String submessage) { - message = "{\"text\":\"" + message + "\"}"; - PacketPlayOutTitle title = new PacketPlayOutTitle(EnumTitleAction.TITLE, ChatSerializer.a(message), 10, 100, - 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(title); - submessage = "{\"text\":\"" + submessage + "\"}"; - PacketPlayOutTitle subtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, ChatSerializer.a(submessage), 10, - 100, 10); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(subtitle); - } -} |
