Skip to content

Revert back to older version of Spigot API #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jackah2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Revert back to older version of Spigot API #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8e8b4d
Revert back to older version of Spigot API
jackah2 Sep 22, 2022
a695b90
Update API version
jackah2 Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>edu.whimc</groupId>
<artifactId>WHIMC-Observations</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
<name>WHIMC Observations</name>
<description>Create holographic observations in worlds</description>

<repositories>
<!-- This adds the Spigot Maven repository to the build -->
<repository>
<id>apache-repo</id>
<url>https://mvnrepository.com/artifact/org.apache.commons/commons-lang3</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
Expand All @@ -31,40 +27,39 @@
</repositories>

<dependencies>
<!--Apache Strings Library -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<!--This adds the Spigot API artifact to the build -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.18.2-R0.1-SNAPSHOT</version>
<version>1.14.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- Add HolographicDisplays to the build -->
<dependency>
<groupId>com.gmail.filoghost.holographicdisplays</groupId>
<artifactId>holographicdisplays-api</artifactId>
<version>2.4.0</version>
<scope>provided</scope>
</dependency>
<!-- Add Quests to the build -->
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-api</artifactId>
<version>4.5.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-core</artifactId>
<version>4.5.3</version>
<scope>provided</scope>
</dependency>
<!-- Add ProtocolLib to the build-->
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.7.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/whimc/observations/commands/ObserveCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/edu/whimc/observations/models/Observation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/whimc/observations/observetemplate/gui/TemplateGui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/whimc/observations/observetemplate/gui/TemplateSelection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/whimc/observations/observetemplate/models/ObservationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down