Skip to content

Commit 27cd552

Browse files
Added support for ShopGUIPlus 1.78.0
1 parent 8fe5d49 commit 27cd552

5 files changed

Lines changed: 41 additions & 6 deletions

File tree

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
group 'net.mackenziemolloy.shopguiplus.sellgui'
7-
version '1.1.4'
7+
version '1.1.5'
88

99
repositories {
1010
mavenLocal()
@@ -20,7 +20,7 @@ repositories {
2020

2121
dependencies {
2222
compileOnly "org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT"
23-
compileOnly 'com.github.brcdev-minecraft:shopgui-api:2.4.0'
23+
compileOnly 'com.github.brcdev-minecraft:shopgui-api:3.0.0'
2424
compileOnly 'org.jetbrains:annotations:22.0.0'
2525
implementation 'org.apache.commons:commons-lang3:3.12.0'
2626
implementation "dev.triumphteam:triumph-gui:3.1.2"

src/main/java/net/mackenziemolloy/shopguiplus/sellgui/SellGUI.java

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
import java.io.File;
44
import java.io.IOException;
55
import java.io.InputStream;
6+
import java.util.function.Supplier;
67
import java.util.logging.Level;
78
import java.util.logging.Logger;
89

910
import org.bukkit.Bukkit;
1011
import org.bukkit.ChatColor;
1112
import org.bukkit.command.CommandSender;
1213
import org.bukkit.configuration.InvalidConfigurationException;
14+
import org.bukkit.plugin.Plugin;
1315
import org.bukkit.plugin.PluginDescriptionFile;
16+
import org.bukkit.plugin.PluginManager;
1417
import org.bukkit.plugin.java.JavaPlugin;
1518

1619
import net.mackenziemolloy.shopguiplus.sellgui.command.CommandSellGUI;
@@ -22,17 +25,24 @@
2225
public final class SellGUI extends JavaPlugin {
2326
private CommentedConfiguration configuration;
2427
private String version;
28+
29+
public boolean compatible = false;
2530

2631
public SellGUI() {
2732
this.configuration = new CommentedConfiguration();
2833
this.version = null;
2934
}
3035

36+
37+
38+
3139
@Override
3240
public void onEnable() {
3341
new CommandSellGUI(this).register();
3442
Logger logger = getLogger();
35-
43+
44+
checkCompatibility();
45+
3646
this.version = VersionUtility.getNetMinecraftServerVersion();
3747
logger.info("Your server is running version '" + this.version + "'.");
3848

@@ -44,8 +54,26 @@ public void onEnable() {
4454
logger.info("ShopGUIPlus SellGUI");
4555
logger.info("Made by Mackenzie Molloy");
4656
logger.info("*-*");
57+
4758
}
48-
59+
60+
public void checkCompatibility() {
61+
try {
62+
Class.forName("net.brcdev.shopgui.shop.item.ShopItem");
63+
compatible = true;
64+
} catch(ReflectiveOperationException ex) {
65+
compatible = false;
66+
}
67+
68+
}
69+
70+
public String getSGPVersion() {
71+
Plugin plugin = getServer().getPluginManager().getPlugin("ShopGUIPlus");
72+
PluginDescriptionFile description = plugin.getDescription();
73+
return description.getVersion();
74+
75+
}
76+
4977
public CommentedConfiguration getConfiguration() {
5078
return this.configuration;
5179
}

src/main/java/net/mackenziemolloy/shopguiplus/sellgui/command/CommandSellGUI.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import net.brcdev.shopgui.economy.EconomyType;
5656
import net.brcdev.shopgui.event.ShopPostTransactionEvent;
5757
import net.brcdev.shopgui.provider.economy.EconomyProvider;
58-
import net.brcdev.shopgui.shop.ShopItem;
58+
import net.brcdev.shopgui.shop.item.ShopItem;
5959
import net.brcdev.shopgui.shop.ShopManager.ShopAction;
6060
import net.brcdev.shopgui.shop.ShopTransactionResult;
6161
import net.brcdev.shopgui.shop.ShopTransactionResult.ShopTransactionResultType;
@@ -87,6 +87,12 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
8787

8888
@Override
8989
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
90+
if(!plugin.compatible) {
91+
String message = MessageUtility.color("&7\n&7\n&a&lUPDATE REQUIRED \n&7\n&7Unfortunately &fSellGUI &7will not work until you update &cShopGUIPlus&7 to version &c1.78.0&7 or above.\n&7\n&eDownload: https://spigotmc.org/resources/6515/\n&7\n&7");
92+
sender.sendMessage(message);
93+
return false;
94+
}
95+
9096
if(args.length == 0) {
9197
return commandBase(sender);
9298
}

src/main/resources/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ options:
8282
# - "&7Lore Line 1"
8383
# - "&9Lore line 2"
8484
# ...and so on
85+
# customModelData: 1
8586
# commandsOnClick: (or commandsOnClickConsole)
8687
# - "say %PLAYER%"
8788
# slot: 1

src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: "An addon for ShopGUIPlus that enables players to easily sell items
44
website: "https://www.spigotmc.org/resources/85170/"
55

66
main: "net.mackenziemolloy.shopguiplus.sellgui.SellGUI"
7-
version: "1.1.4"
7+
version: "1.1.5"
88
api-version: "1.13"
99

1010
authors:

0 commit comments

Comments
 (0)