Skip to content

Commit 7c1f1ab

Browse files
author
Francisco Solis
authored
1.17 Support (#9)
1 parent 1e65d42 commit 7c1f1ab

File tree

17 files changed

+51
-2591
lines changed

17 files changed

+51
-2591
lines changed

‎pom.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,18 @@
5959
<shadedPattern>xyz.theprogramsrc.supercoreapi.libs.apache.commons.codec</shadedPattern>
6060
</relocation>
6161
<relocation>
62-
<pattern>org.slf4j</pattern>
63-
<shadedPattern>xyz.theprogramsrc.supercoreapi.libs.slf4j</shadedPattern>
62+
<pattern>org.apache.commons.io</pattern>
63+
<shadedPattern>xyz.theprogramsrc.supercoreapi.apache.commons.io</shadedPattern>
6464
</relocation>
6565
</relocations>
66+
<filters>
67+
<filter>
68+
<artifact>*:*</artifact>
69+
<includes>
70+
<include>com/cryptomorin/xseries/*</include>
71+
</includes>
72+
</filter>
73+
</filters>
6674
</configuration>
6775
</execution>
6876
</executions>
@@ -166,6 +174,13 @@
166174
<version>1.16.5-R0.1-SNAPSHOT</version>
167175
<scope>provided</scope>
168176
</dependency>
177+
<!-- XSeries -->
178+
<dependency>
179+
<groupId>com.github.cryptomorin</groupId>
180+
<artifactId>XSeries</artifactId>
181+
<version>8.0.0</version>
182+
<scope>compile</scope>
183+
</dependency>
169184
<!-- SLF4J -->
170185
<dependency>
171186
<groupId>org.slf4j</groupId>

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/dialog/Dialog.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package xyz.theprogramsrc.supercoreapi.spigot.dialog;
22

3+
import com.cryptomorin.xseries.messages.ActionBar;
4+
import com.cryptomorin.xseries.messages.Titles;
35
import org.bukkit.entity.Player;
46
import org.bukkit.event.EventHandler;
57
import org.bukkit.event.EventPriority;
@@ -13,8 +15,6 @@
1315
import xyz.theprogramsrc.supercoreapi.global.translations.Base;
1416
import xyz.theprogramsrc.supercoreapi.global.utils.Utils;
1517
import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule;
16-
import xyz.theprogramsrc.supercoreapi.spigot.packets.Actionbar;
17-
import xyz.theprogramsrc.supercoreapi.spigot.packets.Title;
1818

1919
import java.util.HashMap;
2020
import java.util.concurrent.atomic.AtomicReference;
@@ -62,8 +62,8 @@ public void openDialog(){
6262
}
6363

6464
private void sendTitleAndActionbar() {
65-
Title.sendTitle(this.getPlayer(), 0, 999, 0, this.apply(Utils.ct(this.getTitle() != null ? this.getTitle() : "")), this.apply(Utils.ct(this.getSubtitle() != null ? this.getSubtitle() : "")));
66-
Actionbar.sendActionBar(this.getPlayer(), this.apply(Utils.ct(this.getActionbar() != null ? this.getActionbar() : "")));
65+
Titles.sendTitle(this.player, 0, 999, 0, this.apply(Utils.ct(this.getTitle() != null ? this.getTitle() : "")), this.apply(Utils.ct(this.getSubtitle() != null ? this.getSubtitle() : "")));
66+
ActionBar.sendActionBar(this.getPlayer(), this.apply(Utils.ct(this.getActionbar() != null ? this.getActionbar() : "")));
6767
}
6868

6969
/**
@@ -74,8 +74,8 @@ public void close(){
7474
if(this.task != null) this.task.stop();
7575
HandlerList.unregisterAll(this);
7676
this.getSpigotTasks().runAsyncTask(() -> {
77-
Title.clearTitle(this.getPlayer());
78-
Actionbar.clearActionbar(this.getPlayer());
77+
Titles.clearTitle(this.getPlayer());
78+
ActionBar.clearActionBar(this.getPlayer());
7979
});
8080
this.onDialogClose();
8181
if(this.recall != null){

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/GUI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package xyz.theprogramsrc.supercoreapi.spigot.guis;
22

3+
import com.cryptomorin.xseries.XMaterial;
34
import org.bukkit.Bukkit;
45
import org.bukkit.entity.Player;
56
import org.bukkit.event.EventHandler;
@@ -18,7 +19,6 @@
1819
import xyz.theprogramsrc.supercoreapi.spigot.guis.action.ClickType;
1920
import xyz.theprogramsrc.supercoreapi.spigot.guis.events.*;
2021
import xyz.theprogramsrc.supercoreapi.spigot.guis.objects.GUIRows;
21-
import xyz.theprogramsrc.supercoreapi.spigot.utils.xseries.XMaterial;
2222

2323
import java.util.Collection;
2424
import java.util.LinkedHashMap;

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/precreated/ConfirmationGUI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package xyz.theprogramsrc.supercoreapi.spigot.guis.precreated;
22

3+
import com.cryptomorin.xseries.XMaterial;
34
import org.bukkit.entity.Player;
45
import xyz.theprogramsrc.supercoreapi.global.translations.Base;
56
import xyz.theprogramsrc.supercoreapi.spigot.guis.GUI;
67
import xyz.theprogramsrc.supercoreapi.spigot.guis.GUIButton;
78
import xyz.theprogramsrc.supercoreapi.spigot.guis.action.ClickAction;
89
import xyz.theprogramsrc.supercoreapi.spigot.guis.objects.GUIRows;
910
import xyz.theprogramsrc.supercoreapi.spigot.items.SimpleItem;
10-
import xyz.theprogramsrc.supercoreapi.spigot.utils.xseries.XMaterial;
1111

1212
public abstract class ConfirmationGUI extends GUI {
1313

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/precreated/MaterialBrowser.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package xyz.theprogramsrc.supercoreapi.spigot.guis.precreated;
22

3+
import com.cryptomorin.xseries.XMaterial;
34
import org.bukkit.Bukkit;
45
import org.bukkit.entity.Player;
56
import org.bukkit.inventory.Inventory;
67
import xyz.theprogramsrc.supercoreapi.global.translations.Base;
8+
import xyz.theprogramsrc.supercoreapi.global.utils.Utils;
79
import xyz.theprogramsrc.supercoreapi.spigot.guis.BrowserGUI;
810
import xyz.theprogramsrc.supercoreapi.spigot.guis.GUIButton;
911
import xyz.theprogramsrc.supercoreapi.spigot.guis.action.ClickAction;
1012
import xyz.theprogramsrc.supercoreapi.spigot.items.SimpleItem;
11-
import xyz.theprogramsrc.supercoreapi.spigot.utils.xseries.XMaterial;
1213

1314
import java.util.Arrays;
1415

@@ -21,7 +22,7 @@ public MaterialBrowser(Player player) {
2122
@Override
2223
public XMaterial[] getObjects() {
2324
Inventory inventory = Bukkit.createInventory(null, 9);
24-
return Arrays.stream(XMaterial.itemsSupported()).filter(m-> m.parseMaterial() != null).filter(m->{
25+
return Arrays.stream(XMaterial.values()).filter(XMaterial::isSupported).filter(m-> m.parseMaterial() != null).filter(m->{
2526
inventory.setItem(4, m.parseItem());
2627
if(inventory.getItem(4) != null){
2728
inventory.clear();
@@ -34,11 +35,11 @@ public XMaterial[] getObjects() {
3435
@Override
3536
public GUIButton getButton(XMaterial xMaterial) {
3637
SimpleItem item = new SimpleItem(xMaterial)
37-
.setDisplayName("&a"+Base.MATERIAL_SELECTOR_ITEM_NAME.toString())
38+
.setDisplayName("&a" + Base.MATERIAL_SELECTOR_ITEM_NAME)
3839
.setLore(
3940
"&7",
4041
"&7" + Base.MATERIAL_SELECTOR_ITEM_DESCRIPTION
41-
).addPlaceholder("{Material}", xMaterial.getHumanName());
42+
).addPlaceholder("{Material}", Utils.getEnumName(xMaterial));
4243
return new GUIButton(item).setAction(a-> this.onSelect(a, xMaterial));
4344
}
4445

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/precreated/settings/SettingsGUI.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.bukkit.entity.Player;
44
import xyz.theprogramsrc.supercoreapi.global.translations.Base;
5-
import xyz.theprogramsrc.supercoreapi.global.utils.Utils;
65
import xyz.theprogramsrc.supercoreapi.spigot.guis.GUI;
76
import xyz.theprogramsrc.supercoreapi.spigot.guis.GUIButton;
87
import xyz.theprogramsrc.supercoreapi.spigot.guis.action.ClickAction;
@@ -52,7 +51,7 @@ protected String getTitle() {
5251
return "&c" + Base.SETTING_PANE_GUI_TITLE.options().placeholder("{Setting}", settingPane.getDisplayName()).get();
5352
}
5453

55-
return "&c" + Base.SETTINGS_GUI_TITLE.toString();
54+
return "&c" + Base.SETTINGS_GUI_TITLE;
5655
}
5756

5857
public abstract SettingPane[] getSettingPanes();

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/precreated/settings/precreated/GeneralConfigurationSettingPane.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package xyz.theprogramsrc.supercoreapi.spigot.guis.precreated.settings.precreated;
22

3+
import com.cryptomorin.xseries.XMaterial;
34
import xyz.theprogramsrc.supercoreapi.global.translations.Base;
45
import xyz.theprogramsrc.supercoreapi.global.utils.Utils;
56
import xyz.theprogramsrc.supercoreapi.spigot.dialog.Dialog;
67
import xyz.theprogramsrc.supercoreapi.spigot.guis.GUIButton;
78
import xyz.theprogramsrc.supercoreapi.spigot.guis.objects.GUIRows;
89
import xyz.theprogramsrc.supercoreapi.spigot.guis.precreated.settings.SettingPane;
910
import xyz.theprogramsrc.supercoreapi.spigot.items.SimpleItem;
10-
import xyz.theprogramsrc.supercoreapi.spigot.utils.xseries.XMaterial;
1111

1212
import java.util.LinkedList;
1313

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/guis/precreated/settings/precreated/LanguageSelectionSettingPane.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package xyz.theprogramsrc.supercoreapi.spigot.guis.precreated.settings.precreated;
22

3+
import com.cryptomorin.xseries.XMaterial;
34
import xyz.theprogramsrc.supercoreapi.global.translations.Base;
4-
import xyz.theprogramsrc.supercoreapi.global.translations.TranslationPack;
55
import xyz.theprogramsrc.supercoreapi.spigot.guis.GUIButton;
66
import xyz.theprogramsrc.supercoreapi.spigot.guis.precreated.settings.CustomSettingPane;
77
import xyz.theprogramsrc.supercoreapi.spigot.items.SimpleItem;
8-
import xyz.theprogramsrc.supercoreapi.spigot.utils.xseries.XMaterial;
98

109
import java.util.Locale;
1110

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/items/PreloadedItems.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package xyz.theprogramsrc.supercoreapi.spigot.items;
22

3+
import com.cryptomorin.xseries.XMaterial;
34
import org.bukkit.enchantments.Enchantment;
45
import xyz.theprogramsrc.supercoreapi.global.translations.Base;
56
import xyz.theprogramsrc.supercoreapi.global.utils.Utils;
67
import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule;
7-
import xyz.theprogramsrc.supercoreapi.spigot.utils.xseries.XMaterial;
88

99
/**
1010
* Representation of the Pre-Created Items

‎src/main/java/xyz/theprogramsrc/supercoreapi/spigot/items/SimpleItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package xyz.theprogramsrc.supercoreapi.spigot.items;
22

3+
import com.cryptomorin.xseries.XMaterial;
34
import com.mojang.authlib.GameProfile;
45
import com.mojang.authlib.properties.Property;
56
import org.apache.commons.codec.binary.Base64;
@@ -16,7 +17,6 @@
1617
import xyz.theprogramsrc.supercoreapi.spigot.SpigotPlugin;
1718
import xyz.theprogramsrc.supercoreapi.spigot.utils.SpigotUtils;
1819
import xyz.theprogramsrc.supercoreapi.spigot.utils.skintexture.SkinTexture;
19-
import xyz.theprogramsrc.supercoreapi.spigot.utils.xseries.XMaterial;
2020

2121
import java.lang.reflect.Field;
2222
import java.util.*;
@@ -26,7 +26,7 @@
2626
*/
2727
public class SimpleItem {
2828

29-
private final SpigotUtils utils = ((SpigotUtils)SpigotPlugin.i.getSuperUtils());
29+
private final SpigotUtils utils = SpigotPlugin.i.getSuperUtils();
3030
private ItemStack item;
3131
private LinkedHashMap<String, String> placeholders;
3232

0 commit comments

Comments
 (0)