Skip to content

Update to 1.12 (Fixes #17) #18

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
TuxCoding wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to 1.12 (Fixes #17) #18

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
12 changes: 8 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.sainttx</groupId>
<artifactId>auctions</artifactId>
<version>2.5.0-SNAPSHOT</version>
<version>2.5.1-SNAPSHOT</version>

<name>Auctions</name>
<description>An elegant auctioning solution that allows text tooltips for auctioned items</description>
Expand All @@ -19,6 +19,10 @@
</license>
</licenses>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<repository>
<id>spigot-repo</id>
Expand Down Expand Up @@ -50,13 +54,13 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.9.2-R0.1-SNAPSHOT</version>
<version>1.12-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.5</version>
<version>1.6</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -258,4 +262,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
26 changes: 15 additions & 11 deletions src/main/java/com/sainttx/auctions/AuctionPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,28 @@
import com.sainttx.auctions.structure.messages.group.HerochatGroup;
import com.sainttx.auctions.structure.messages.handler.ActionBarMessageHandler;
import com.sainttx.auctions.structure.messages.handler.TextualMessageHandler;
import net.milkbowl.vault.economy.Economy;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.mcstats.MetricsLite;

import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import java.util.logging.Level;

import net.milkbowl.vault.economy.Economy;

import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import org.mcstats.MetricsLite;

/**
* The auction plugin class
*/
Expand Down Expand Up @@ -172,7 +175,8 @@ private boolean canRegisterPlaceholders() {
@SuppressWarnings("deprecation")
private void checkOutdatedConfig() {
try {
Configuration def = YamlConfiguration.loadConfiguration(getResource("config.yml"));
InputStreamReader reader = new InputStreamReader(getResource("config.yml"));
Configuration def = YamlConfiguration.loadConfiguration(reader);
int version = def.getInt("general.configurationVersion");

if (getConfig().getInt("general.configurationVersion") < version) {
Expand Down Expand Up @@ -417,4 +421,4 @@ private void loadOfflineRewards() {
offlineRewardCache.put(UUID.fromString(string), reward);
}
}
}
}