From a91b033d4e484d55588a24e160a1bb95fc737912 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Fri, 24 Mar 2023 23:21:08 -0400
Subject: [PATCH] CitizensBooks is now AstralBooks
---
api/pom.xml | 13 ++++---
.../quests/dependencies/IDependencies.java | 4 +--
core/pom.xml | 15 +++++---
.../me/blackvein/quests/Dependencies.java | 34 +++++++++----------
.../me/blackvein/quests/actions/Action.java | 8 ++---
core/src/main/resources/plugin.yml | 2 +-
6 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 4b1e0b1ca..7327bbdf7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -16,7 +16,7 @@
-
+
jitpack.io
https://jitpack.io
@@ -49,6 +49,11 @@
hc-repo
https://nexus.hc.to/content/repositories/pub_releases/
+
+
+ repsy-release
+ https://repo.repsy.io/mvn/niconeko/release
+
@@ -107,9 +112,9 @@
provided
- com.github.nicuch
- CitizensBooks
- 2.5.5
+ ro.niconeko
+ AstralBooks
+ 3.0.0
provided
diff --git a/api/src/main/java/me/blackvein/quests/dependencies/IDependencies.java b/api/src/main/java/me/blackvein/quests/dependencies/IDependencies.java
index 5841a2a74..d5a990ba9 100644
--- a/api/src/main/java/me/blackvein/quests/dependencies/IDependencies.java
+++ b/api/src/main/java/me/blackvein/quests/dependencies/IDependencies.java
@@ -27,7 +27,7 @@ import net.citizensnpcs.api.CitizensPlugin;
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission;
import org.bukkit.Location;
-import ro.nicuch.citizensbooks.CitizensBooksAPI;
+import ro.niconeko.astralbooks.AstralBooksAPI;
import java.util.Set;
import java.util.UUID;
@@ -57,7 +57,7 @@ public interface IDependencies {
DenizenAPI getDenizenApi();
- CitizensBooksAPI getCitizensBooksApi();
+ AstralBooksAPI getAstralBooksApi();
ServersNPC getZnpcs();
diff --git a/core/pom.xml b/core/pom.xml
index f3fe31cec..959761d2e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -16,7 +16,7 @@
-
+
jitpack.io
https://jitpack.io
@@ -49,6 +49,11 @@
hc-repo
https://nexus.hc.to/content/repositories/pub_releases/
+
+
+ repsy-release
+ https://repo.repsy.io/mvn/niconeko/release
+
@@ -103,13 +108,13 @@
me.clip
placeholderapi
- 2.9.2
+ 2.11.2
provided
- com.github.nicuch
- CitizensBooks
- 2.5.5
+ ro.niconeko
+ AstralBooks
+ 3.0.0
provided
diff --git a/core/src/main/java/me/blackvein/quests/Dependencies.java b/core/src/main/java/me/blackvein/quests/Dependencies.java
index c3d00908e..94cc39d9e 100644
--- a/core/src/main/java/me/blackvein/quests/Dependencies.java
+++ b/core/src/main/java/me/blackvein/quests/Dependencies.java
@@ -40,8 +40,8 @@ import org.bukkit.plugin.RegisteredListener;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import ro.nicuch.citizensbooks.CitizensBooksAPI;
-import ro.nicuch.citizensbooks.CitizensBooksPlugin;
+import ro.niconeko.astralbooks.AstralBooksAPI;
+import ro.niconeko.astralbooks.AstralBooksPlugin;
import java.util.Collections;
import java.util.HashSet;
@@ -58,13 +58,13 @@ public class Dependencies implements IDependencies {
private static Permission permission = null;
private static PartyProvider partyProvider = null;
private static final Set partyProviders = new HashSet<>();
- private static WorldGuardAPI worldGuardApi = null;
+ private static WorldGuardAPI worldGuard = null;
private static mcMMO mcmmo = null;
private static Heroes heroes = null;
public static PlaceholderAPIPlugin placeholder = null;
public static CitizensPlugin citizens = null;
- private static DenizenAPI denizenApi = null;
- private static CitizensBooksAPI citizensBooks = null;
+ private static DenizenAPI denizen = null;
+ private static AstralBooksAPI astralBooks = null;
private static ServersNPC znpcs = null;
private static PartiesAPI parties = null;
@@ -109,10 +109,10 @@ public class Dependencies implements IDependencies {
}
public WorldGuardAPI getWorldGuardApi() {
- if (worldGuardApi == null && isPluginAvailable("WorldGuard")) {
- worldGuardApi = new WorldGuardAPI(plugin.getServer().getPluginManager().getPlugin("WorldGuard"));
+ if (worldGuard == null && isPluginAvailable("WorldGuard")) {
+ worldGuard = new WorldGuardAPI(plugin.getServer().getPluginManager().getPlugin("WorldGuard"));
}
- return worldGuardApi;
+ return worldGuard;
}
public mcMMO getMcmmoClassic() {
@@ -178,22 +178,22 @@ public class Dependencies implements IDependencies {
}
public DenizenAPI getDenizenApi() {
- if (denizenApi == null && isPluginAvailable("Denizen")) {
- denizenApi = new DenizenAPI();
+ if (denizen == null && isPluginAvailable("Denizen")) {
+ denizen = new DenizenAPI();
}
- return denizenApi;
+ return denizen;
}
- public CitizensBooksAPI getCitizensBooksApi() {
- if (citizensBooks == null && isPluginAvailable("CitizensBooks")) {
+ public AstralBooksAPI getAstralBooksApi() {
+ if (astralBooks == null && isPluginAvailable("AstralBooks")) {
try {
- citizensBooks = ((CitizensBooksPlugin) Objects.requireNonNull(plugin.getServer().getPluginManager()
- .getPlugin("CitizensBooks"))).getAPI();
+ astralBooks = ((AstralBooksPlugin) Objects.requireNonNull(plugin.getServer().getPluginManager()
+ .getPlugin("AstralBooks"))).getAPI();
} catch (final Exception e) {
e.printStackTrace();
}
}
- return citizensBooks;
+ return astralBooks;
}
public ServersNPC getZnpcs() {
@@ -369,7 +369,7 @@ public class Dependencies implements IDependencies {
getMcmmoClassic();
getHeroes();
getPlaceholderApi();
- getCitizensBooksApi();
+ getAstralBooksApi();
getPartiesApi();
getPartyProvider();
getVaultEconomy();
diff --git a/core/src/main/java/me/blackvein/quests/actions/Action.java b/core/src/main/java/me/blackvein/quests/actions/Action.java
index 980527a87..ffb7bc4c6 100644
--- a/core/src/main/java/me/blackvein/quests/actions/Action.java
+++ b/core/src/main/java/me/blackvein/quests/actions/Action.java
@@ -404,10 +404,10 @@ public class Action implements IAction {
}
if (book != null) {
if (!book.isEmpty()) {
- if (plugin.getDependencies().getCitizensBooksApi() != null) {
- if (plugin.getDependencies().getCitizensBooksApi().hasFilter(book)) {
- plugin.getDependencies().getCitizensBooksApi().openBook(player, plugin.getDependencies()
- .getCitizensBooksApi().getFilter(book));
+ if (plugin.getDependencies().getAstralBooksApi() != null) {
+ if (plugin.getDependencies().getAstralBooksApi().hasFilterBook(book)) {
+ plugin.getDependencies().getAstralBooksApi().openBook(player, plugin.getDependencies()
+ .getAstralBooksApi().getFilterBook(book));
}
}
}
diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml
index c2776be93..c05c7a2b2 100644
--- a/core/src/main/resources/plugin.yml
+++ b/core/src/main/resources/plugin.yml
@@ -5,7 +5,7 @@ api-version: 1.13
description: An extensive questing system.
website: https://github.com/PikaMug/Quests
author: PikaMug
-softdepend: [Citizens, CitizensBooks, Denizen, DungeonsXL, GPS, Heroes, mcMMO, Parties, PlaceholderAPI, Unite, Vault, WorldGuard]
+softdepend: [AstralBooks, Citizens, Denizen, DungeonsXL, GPS, Heroes, mcMMO, Parties, PlaceholderAPI, Unite, Vault, WorldGuard]
permissions:
quests.*:
description: Access ALL Quests functionality