Skip to content

Update to 1.13 #23

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
Fabricio20 wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Update to 1.13 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions Auctions-API/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,21 @@

<artifactId>auctions-api</artifactId>

<repositories>
<repository>
<id>maven.sk89q.com</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
<repository>
<id>NotFab</id>
<url>https://maven.notfab.net/SpigotMC</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository>
</repositories>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
10 changes: 5 additions & 5 deletions Auctions-Herochat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@

<repositories>
<repository>
<id>maven.sainttx.com-snapshot</id>
<url>http://maven.sainttx.com/artifactory/libs-snapshot-local</url>
<id>hero</id>
<url>http://maven.elmakers.com/repository/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>com.dthielke</groupId>
<artifactId>herochat</artifactId>
<version>5.6.7-SNAPSHOT</version>
<groupId>com.dthielke.herochat</groupId>
<artifactId>HeroChat</artifactId>
<version>5.6.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
12 changes: 10 additions & 2 deletions Auctions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,21 @@
<id>maven.sk89q.com</id>
<url>http://maven.sk89q.com/repo/</url>
</repository>
<repository>
<id>NotFab</id>
<url>https://maven.notfab.net/SpigotMC</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8-R0.1-SNAPSHOT</version>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -59,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.mcstats.bukkit</groupId>
<artifactId>metrics-lite</artifactId>
<artifactId>metrics</artifactId>
<version>R8-SNAPSHOT</version>
</dependency>
</dependencies>
Expand Down
7 changes: 4 additions & 3 deletions Auctions/src/main/java/com/sainttx/auctions/AuctionPluginImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.mcstats.MetricsLite;
import org.mcstats.Metrics;

import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -150,7 +151,7 @@ public void onEnable() {

// Enable plugin metrics
try {
MetricsLite metrics = new MetricsLite(this);
Metrics metrics = new Metrics(this);
metrics.start();
} catch (Exception ignored) {
}
Expand Down Expand Up @@ -208,7 +209,7 @@ private void loadConfig() {
@SuppressWarnings("deprecation")
private void checkOutdatedConfig() {
try {
Configuration def = YamlConfiguration.loadConfiguration(getResource("config.yml"));
Configuration def = YamlConfiguration.loadConfiguration(new InputStreamReader(getResource("config.yml")));
int version = def.getInt("general.configurationVersion");

if (getConfig().getInt("general.configurationVersion") < version) {
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>maven.sainttx.com-snapshot</id>
<url>http://maven.sainttx.com/artifactory/libs-snapshot-local</url>
<id>NotFab</id>
<url>https://maven.notfab.net/SpigotMC</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8.8-R0.1-SNAPSHOT</version>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down