From c8e8b4d51295392d2b47a6572684a7b2cfb53521 Mon Sep 17 00:00:00 2001 From: Jack Henhapl Date: Wed, 21 Sep 2022 20:51:56 -0500 Subject: [PATCH 1/2] Revert back to older version of Spigot API --- pom.xml | 19 +++++++------------ .../observations/commands/ObserveCommand.java | 2 +- .../observations/models/Observation.java | 1 + .../observetemplate/gui/TemplateGui.java | 2 +- .../gui/TemplateSelection.java | 2 +- .../models/ObservationType.java | 2 +- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index ae3acaf..836c2bf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,12 @@ 4.0.0 edu.whimc WHIMC-Observations - 2.5.3 + 2.5.4 WHIMC Observations Create holographic observations in worlds - - apache-repo - https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 - spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ @@ -31,40 +27,39 @@ - - - org.apache.commons - commons-lang3 - 3.12.0 - org.spigotmc spigot-api - 1.18.2-R0.1-SNAPSHOT + 1.14.4-R0.1-SNAPSHOT + provided com.gmail.filoghost.holographicdisplays holographicdisplays-api 2.4.0 + provided me.blackvein.quests quests-api 4.5.3 + provided me.blackvein.quests quests-core 4.5.3 + provided com.comphenix.protocol ProtocolLib 4.7.0 + provided diff --git a/src/main/java/edu/whimc/observations/commands/ObserveCommand.java b/src/main/java/edu/whimc/observations/commands/ObserveCommand.java index 52641a6..d8c82c9 100644 --- a/src/main/java/edu/whimc/observations/commands/ObserveCommand.java +++ b/src/main/java/edu/whimc/observations/commands/ObserveCommand.java @@ -3,7 +3,7 @@ import edu.whimc.observations.Observations; import edu.whimc.observations.models.Observation; import edu.whimc.observations.utils.Utils; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/edu/whimc/observations/models/Observation.java b/src/main/java/edu/whimc/observations/models/Observation.java index 2891f71..1df5adc 100644 --- a/src/main/java/edu/whimc/observations/models/Observation.java +++ b/src/main/java/edu/whimc/observations/models/Observation.java @@ -39,6 +39,7 @@ public class Observation { private Hologram hologram; private Timestamp expiration; private Material hologramItem; + protected Observation(Observations plugin, int id, Timestamp timestamp, String playerName, Location viewLoc, String observation, Timestamp expiration, ObservationTemplate template, boolean isTemporary, boolean isNew) { diff --git a/src/main/java/edu/whimc/observations/observetemplate/gui/TemplateGui.java b/src/main/java/edu/whimc/observations/observetemplate/gui/TemplateGui.java index 3d6a019..4acf788 100644 --- a/src/main/java/edu/whimc/observations/observetemplate/gui/TemplateGui.java +++ b/src/main/java/edu/whimc/observations/observetemplate/gui/TemplateGui.java @@ -7,7 +7,7 @@ import edu.whimc.observations.observetemplate.models.ObservationTemplate; import edu.whimc.observations.observetemplate.models.ObservationType; import edu.whimc.observations.utils.Utils; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/edu/whimc/observations/observetemplate/gui/TemplateSelection.java b/src/main/java/edu/whimc/observations/observetemplate/gui/TemplateSelection.java index 2dbc761..a7058ea 100644 --- a/src/main/java/edu/whimc/observations/observetemplate/gui/TemplateSelection.java +++ b/src/main/java/edu/whimc/observations/observetemplate/gui/TemplateSelection.java @@ -12,7 +12,7 @@ import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.HoverEvent.Action; import net.md_5.bungee.api.chat.TextComponent; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/edu/whimc/observations/observetemplate/models/ObservationType.java b/src/main/java/edu/whimc/observations/observetemplate/models/ObservationType.java index fdab86e..a4b12f8 100644 --- a/src/main/java/edu/whimc/observations/observetemplate/models/ObservationType.java +++ b/src/main/java/edu/whimc/observations/observetemplate/models/ObservationType.java @@ -1,6 +1,6 @@ package edu.whimc.observations.observetemplate.models; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; public enum ObservationType { From a695b908d3a42005ac050705a688549fc1d29a9b Mon Sep 17 00:00:00 2001 From: Jack Henhapl Date: Wed, 21 Sep 2022 20:53:23 -0500 Subject: [PATCH 2/2] Update API version --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 3150183..889b9c2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: ${project.artifactId} version: ${project.version} description: ${project.description} author: Jack Henhapl -api-version: 1.13 +api-version: 1.14 main: edu.whimc.observations.Observations load: POSTWORLD depend: [HolographicDisplays, ProtocolLib]