Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2024-11-25 05:55:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

2.110.0 - 1.20.6 support

Browse Source 
Took 19 minutes
This commit is contained in:
Kiran Hart 2024-05-01 12:13:23 -04:00
parent ac4b35be02
commit 12d23279eb
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
9 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -8,7 +8,7 @@
<name>AuctionHouse</name> <name>AuctionHouse</name>
<description>The ultimate auction solution for your server</description> <description>The ultimate auction solution for your server</description>
<version>2.109.1</version> <version>2.110.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<author>Kiran Hart</author> <author>Kiran Hart</author>
@ -102,7 +102,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.20.2-R0.1-SNAPSHOT</version> <version>1.20.3-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -119,7 +119,7 @@
<dependency> <dependency>
<groupId>ca.tweetzy</groupId> <groupId>ca.tweetzy</groupId>
<artifactId>tweetycore</artifactId> <artifactId>tweetycore</artifactId>
<version>3.8.0</version> <version>3.9.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mineacademy.plugin</groupId> <groupId>org.mineacademy.plugin</groupId>
@ -156,7 +156,7 @@
<dependency> <dependency>
<groupId>me.clip</groupId> <groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId> <artifactId>placeholderapi</artifactId>
<version>2.10.10</version> <version>2.11.5</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

15
src/main/java/ca/tweetzy/auctionhouse/AuctionHouse.java
View File

@ -35,7 +35,6 @@ import ca.tweetzy.core.TweetyCore;
import ca.tweetzy.core.TweetyPlugin; import ca.tweetzy.core.TweetyPlugin;
import ca.tweetzy.core.commands.CommandManager; import ca.tweetzy.core.commands.CommandManager;
import ca.tweetzy.core.compatibility.ServerProject; import ca.tweetzy.core.compatibility.ServerProject;
import ca.tweetzy.core.compatibility.ServerVersion;
import ca.tweetzy.core.configuration.Config; import ca.tweetzy.core.configuration.Config;
import ca.tweetzy.core.database.DataMigrationManager; import ca.tweetzy.core.database.DataMigrationManager;
import ca.tweetzy.core.database.DatabaseConnector; import ca.tweetzy.core.database.DatabaseConnector;
@ -47,6 +46,7 @@ import ca.tweetzy.core.hooks.PluginHook;
import ca.tweetzy.core.hooks.economies.Economy; import ca.tweetzy.core.hooks.economies.Economy;
import ca.tweetzy.core.utils.Metrics; import ca.tweetzy.core.utils.Metrics;
import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.TextUtils;
import ca.tweetzy.flight.comp.enums.ServerVersion;
import co.aikar.taskchain.BukkitTaskChainFactory; import co.aikar.taskchain.BukkitTaskChainFactory;
import co.aikar.taskchain.TaskChain; import co.aikar.taskchain.TaskChain;
import co.aikar.taskchain.TaskChainFactory; import co.aikar.taskchain.TaskChainFactory;
@ -54,6 +54,7 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -132,7 +133,6 @@ public class AuctionHouse extends TweetyPlugin {
public void onPluginEnable() { public void onPluginEnable() {
TweetyCore.registerPlugin(this, 1, "CHEST"); TweetyCore.registerPlugin(this, 1, "CHEST");
// Check server version
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_7)) { if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_7)) {
getServer().getPluginManager().disablePlugin(this); getServer().getPluginManager().disablePlugin(this);
return; return;
@ -298,9 +298,10 @@ public class AuctionHouse extends TweetyPlugin {
); );
// Placeholder API // Placeholder API
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { final Plugin papi = Bukkit.getPluginManager().getPlugin("PlaceholderAPI");
if (papi != null && papi.isEnabled())
new PlaceholderAPIHook(this).register(); new PlaceholderAPIHook(this).register();
}
// start the auction tick task // start the auction tick task
TickAuctionsTask.startTask(); TickAuctionsTask.startTask();
@ -324,9 +325,9 @@ public class AuctionHouse extends TweetyPlugin {
getLogger().severe("You will not receive any support while using a non-supported jar, support jars: Spigot or Paper"); getLogger().severe("You will not receive any support while using a non-supported jar, support jars: Spigot or Paper");
} }
if (ServerVersion.isServerVersionBelow(ServerVersion.V1_16)) { // if (ServerVersion.isServerVersionBelow(ServerVersion.V1_16)) {
getLogger().severe("You are receiving this message because you're running Auction House on a Minecraft version older than 1.16. As a heads up, Auction House 3.0 is going to be for 1.16+ only"); // getLogger().severe("You are receiving this message because you're running Auction House on a Minecraft version older than 1.16. As a heads up, Auction House 3.0 is going to be for 1.16+ only");
} // }
if (!ServerProject.isServer(ServerProject.PAPER, ServerProject.SPIGOT)) { if (!ServerProject.isServer(ServerProject.PAPER, ServerProject.SPIGOT)) {
getLogger().warning("You're running Auction House on a non supported server jar, although small, there's a chance somethings will not work or just entirely break."); getLogger().warning("You're running Auction House on a non supported server jar, although small, there's a chance somethings will not work or just entirely break.");

4
src/main/java/ca/tweetzy/auctionhouse/api/AuctionAPI.java
View File

@ -24,10 +24,9 @@ import ca.tweetzy.auctionhouse.auction.MinItemPrice;
import ca.tweetzy.auctionhouse.auction.enums.PaymentReason; import ca.tweetzy.auctionhouse.auction.enums.PaymentReason;
import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper;
import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.core.compatibility.ServerVersion;
import ca.tweetzy.core.compatibility.XMaterial; import ca.tweetzy.core.compatibility.XMaterial;
import ca.tweetzy.core.hooks.EconomyManager; import ca.tweetzy.core.hooks.EconomyManager;
import ca.tweetzy.core.utils.items.ItemUtils; import ca.tweetzy.flight.comp.enums.ServerVersion;
import ca.tweetzy.flight.nbtapi.NBT; import ca.tweetzy.flight.nbtapi.NBT;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
@ -598,7 +597,6 @@ public class AuctionAPI {
nbt.setItemStackArray("AuctionBundleItems", items); nbt.setItemStackArray("AuctionBundleItems", items);
}); });
ItemUtils.addGlow(item);
return item; return item;
} }

2
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionedItem.java
View File

@ -25,8 +25,8 @@ import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType;
import ca.tweetzy.auctionhouse.helpers.BundleUtil; import ca.tweetzy.auctionhouse.helpers.BundleUtil;
import ca.tweetzy.auctionhouse.helpers.MaterialCategorizer; import ca.tweetzy.auctionhouse.helpers.MaterialCategorizer;
import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.core.compatibility.ServerVersion;
import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.TextUtils;
import ca.tweetzy.flight.comp.enums.ServerVersion;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;
import lombok.Setter; import lombok.Setter;

2
src/main/java/ca/tweetzy/auctionhouse/commands/CommandMarkChest.java
View File

@ -20,8 +20,8 @@ package ca.tweetzy.auctionhouse.commands;
import ca.tweetzy.auctionhouse.AuctionHouse; import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.core.commands.AbstractCommand; import ca.tweetzy.core.commands.AbstractCommand;
import ca.tweetzy.core.compatibility.ServerVersion;
import ca.tweetzy.core.compatibility.XMaterial; import ca.tweetzy.core.compatibility.XMaterial;
import ca.tweetzy.flight.comp.enums.ServerVersion;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;

2
src/main/java/ca/tweetzy/auctionhouse/guis/GUIAuctionHouse.java
View File

@ -40,12 +40,12 @@ import ca.tweetzy.auctionhouse.helpers.input.TitleInput;
import ca.tweetzy.auctionhouse.hooks.FloodGateHook; import ca.tweetzy.auctionhouse.hooks.FloodGateHook;
import ca.tweetzy.auctionhouse.hooks.PlaceholderAPIHook; import ca.tweetzy.auctionhouse.hooks.PlaceholderAPIHook;
import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.core.compatibility.ServerVersion;
import ca.tweetzy.core.compatibility.XSound; import ca.tweetzy.core.compatibility.XSound;
import ca.tweetzy.core.gui.events.GuiClickEvent; import ca.tweetzy.core.gui.events.GuiClickEvent;
import ca.tweetzy.core.hooks.EconomyManager; import ca.tweetzy.core.hooks.EconomyManager;
import ca.tweetzy.core.utils.NumberUtils; import ca.tweetzy.core.utils.NumberUtils;
import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.TextUtils;
import ca.tweetzy.flight.comp.enums.ServerVersion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;

2
src/main/java/ca/tweetzy/auctionhouse/helpers/PlayerHelper.java
View File

@ -18,7 +18,7 @@
package ca.tweetzy.auctionhouse.helpers; package ca.tweetzy.auctionhouse.helpers;
import ca.tweetzy.core.compatibility.ServerVersion; import ca.tweetzy.flight.comp.enums.ServerVersion;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

2
src/main/java/ca/tweetzy/auctionhouse/listeners/PlayerListeners.java
View File

@ -25,11 +25,11 @@ import ca.tweetzy.auctionhouse.helpers.BundleUtil;
import ca.tweetzy.auctionhouse.helpers.PlayerHelper; import ca.tweetzy.auctionhouse.helpers.PlayerHelper;
import ca.tweetzy.auctionhouse.helpers.UpdateChecker; import ca.tweetzy.auctionhouse.helpers.UpdateChecker;
import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.auctionhouse.settings.Settings;
import ca.tweetzy.core.compatibility.ServerVersion;
import ca.tweetzy.core.compatibility.XMaterial; import ca.tweetzy.core.compatibility.XMaterial;
import ca.tweetzy.core.utils.PlayerUtils; import ca.tweetzy.core.utils.PlayerUtils;
import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.TextUtils;
import ca.tweetzy.flight.comp.Titles; import ca.tweetzy.flight.comp.Titles;
import ca.tweetzy.flight.comp.enums.ServerVersion;
import ca.tweetzy.flight.nbtapi.NBT; import ca.tweetzy.flight.nbtapi.NBT;
import ca.tweetzy.flight.utils.Common; import ca.tweetzy.flight.utils.Common;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
src/main/resources/plugin.yml
View File

@ -5,7 +5,7 @@ main: ca.tweetzy.auctionhouse.AuctionHouse
description: Auction House is a premium auction solution for your server. description: Auction House is a premium auction solution for your server.
website: https://tweetzy.ca/ website: https://tweetzy.ca/
authors: [ Kiran Hart ] authors: [ Kiran Hart ]
softdepend: [ Vault, PlayerPoints, PlaceholderAPIHook, MMOItemsHook, UltraEconomy, CMI, Essentials, ChestShop, EcoEnchants ] softdepend: [ Vault, PlayerPoints, PlaceholderAPI, MMOItemsHook, UltraEconomy, CMI, Essentials, ChestShop, EcoEnchants ]
commands: commands:
auctionhouse: auctionhouse: