Skip to content
This repository was archived by the owner on Sep 9, 2024. It is now read-only.

Commit 9651e74

Browse files
author
BuildTools
committed
Update to RandomPackage 16.5.0
1 parent b89cff1 commit 9651e74

File tree

8 files changed

+110
-102
lines changed

8 files changed

+110
-102
lines changed

‎pom.xml

+50-48
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,52 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>me.puyodead1</groupId>
5-
<artifactId>RPBookGUI</artifactId>
6-
<version>2.9.6</version>
7-
<name>RPBookGUI</name>
8-
<repositories>
9-
<repository>
10-
<id>spigot-repo</id>
11-
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
12-
</repository>
13-
<repository>
14-
<id>bungeecord-repo</id>
15-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
16-
</repository>
17-
<repository>
18-
<id>github</id>
19-
<url>https://github.com/Puyodead1/maven/raw/repository/</url>
20-
</repository>
21-
</repositories>
22-
23-
<dependencies>
24-
<dependency>
25-
<groupId>org.spigotmc</groupId>
26-
<artifactId>spigot-api</artifactId>
27-
<version>1.14.4-R0.1-SNAPSHOT</version>
28-
<scope>provided</scope>
29-
</dependency>
30-
<dependency>
31-
<groupId>me.randomhashtags</groupId>
32-
<artifactId>randompackage</artifactId>
33-
<version>16.4.4</version>
34-
<scope>provided</scope>
35-
</dependency>
36-
</dependencies>
37-
<build>
38-
<sourceDirectory>src/main/java</sourceDirectory>
39-
<plugins>
40-
<plugin>
41-
<artifactId>maven-compiler-plugin</artifactId>
42-
<version>3.8.0</version>
43-
<configuration>
44-
<source>1.8</source>
45-
<target>1.8</target>
46-
</configuration>
47-
</plugin>
48-
</plugins>
49-
</build>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>me.puyodead1</groupId>
7+
<artifactId>RPBookGUI</artifactId>
8+
<version>2.9.7</version>
9+
<name>RPBookGUI</name>
10+
<repositories>
11+
<repository>
12+
<id>spigot-repo</id>
13+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
14+
</repository>
15+
<repository>
16+
<id>bungeecord-repo</id>
17+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
18+
</repository>
19+
<repository>
20+
<id>github</id>
21+
<url>https://github.com/Puyodead1/maven/raw/repository/</url>
22+
</repository>
23+
</repositories>
24+
25+
<dependencies>
26+
<dependency>
27+
<groupId>org.spigotmc</groupId>
28+
<artifactId>spigot-api</artifactId>
29+
<version>1.14.4-R0.1-SNAPSHOT</version>
30+
<scope>provided</scope>
31+
</dependency>
32+
<dependency>
33+
<groupId>me.randomhashtags</groupId>
34+
<artifactId>randompackage</artifactId>
35+
<version>16.5.0</version>
36+
<scope>provided</scope>
37+
</dependency>
38+
</dependencies>
39+
<build>
40+
<sourceDirectory>src/main/java</sourceDirectory>
41+
<plugins>
42+
<plugin>
43+
<artifactId>maven-compiler-plugin</artifactId>
44+
<version>3.8.0</version>
45+
<configuration>
46+
<source>1.8</source>
47+
<target>1.8</target>
48+
</configuration>
49+
</plugin>
50+
</plugins>
51+
</build>
5052
</project>

‎src/main/java/io/github/puyodead1/rpbookgui/Commands/RarityInfo.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88

99
import io.github.puyodead1.rpbookgui.RPBookGUI;
1010
import io.github.puyodead1.rpbookgui.Utils.RPBookGUIUtils;
11-
import me.randomhashtags.randompackage.RandomPackageAPI;
12-
import me.randomhashtags.randompackage.addons.CustomEnchant;
13-
import me.randomhashtags.randompackage.addons.EnchantRarity;
11+
import me.randomhashtags.randompackage.addon.CustomEnchant;
12+
import me.randomhashtags.randompackage.addon.EnchantRarity;
13+
import me.randomhashtags.randompackage.util.RPStorage;
1414

1515
public class RarityInfo implements CommandExecutor {
1616

1717
private FileConfiguration rpbgConfig = RPBookGUI.getPlugin.getConfig();
18-
private static RandomPackageAPI rpapi = new RandomPackageAPI();
1918

2019
@Override
2120
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -26,8 +25,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
2625
|| !rpbgConfig.getBoolean("settings.use permissions")) {
2726
String arg = args[0];
2827
arg = arg.substring(0, 1).toUpperCase() + arg.substring(1, arg.length()).toLowerCase();
29-
CustomEnchant ce = rpapi.valueOfCustomEnchant(arg);
30-
EnchantRarity rarity = rpapi.valueOfEnchantRarity(ce);
28+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(arg);
29+
EnchantRarity rarity = RPStorage.valueOfEnchantRarity(ce);
3130
player.sendMessage(rarity != null
3231
? RPBookGUIUtils
3332
.ChatColor(rpbgConfig.getString("messages.rarity info").replace("{ENCHANT}", arg)

‎src/main/java/io/github/puyodead1/rpbookgui/EnchantConstructor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.bukkit.Bukkit;
66
import org.bukkit.inventory.ItemStack;
77

8-
import me.randomhashtags.randompackage.addons.CustomEnchant;
9-
import me.randomhashtags.randompackage.addons.EnchantRarity;
8+
import me.randomhashtags.randompackage.addon.CustomEnchant;
9+
import me.randomhashtags.randompackage.addon.EnchantRarity;
1010
import me.randomhashtags.randompackage.api.CustomEnchants;
1111

1212
public class EnchantConstructor {
@@ -29,7 +29,7 @@ public EnchantConstructor(CustomEnchant customEnchant, EnchantRarity enchantRari
2929

3030
enchants.put(customEnchant.getIdentifier(), this);
3131

32-
Bukkit.broadcastMessage("EnchantConstructor added: " + customEnchant.getIdentifier() + " " + enchantLevel);
32+
// Bukkit.broadcastMessage("EnchantConstructor added: " + customEnchant.getIdentifier() + " " + enchantLevel);
3333
}
3434

3535
public CustomEnchant getCustomEnchant() {

‎src/main/java/io/github/puyodead1/rpbookgui/Events/InventoryClick.java

+25-26
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818
import io.github.puyodead1.rpbookgui.ItemStacks;
1919
import io.github.puyodead1.rpbookgui.RPBookGUI;
2020
import io.github.puyodead1.rpbookgui.Utils.RPBookGUIUtils;
21+
import io.github.puyodead1.rpbookgui.Utils.UMaterial;
2122
import me.randomhashtags.randompackage.RandomPackageAPI;
22-
import me.randomhashtags.randompackage.addons.CustomEnchant;
23-
import me.randomhashtags.randompackage.addons.EnchantRarity;
24-
import me.randomhashtags.randompackage.utils.universal.UMaterial;
23+
import me.randomhashtags.randompackage.addon.CustomEnchant;
24+
import me.randomhashtags.randompackage.addon.EnchantRarity;
25+
import me.randomhashtags.randompackage.util.RPStorage;
2526

2627
public class InventoryClick implements Listener {
2728

28-
private static RandomPackageAPI rpapi = new RandomPackageAPI();
29-
3029
@EventHandler
3130
public void InventoryClickEvent(InventoryClickEvent e) {
3231
if (!e.isCancelled() && e.getCurrentItem() != null && !e.getCurrentItem().getType().equals(Material.AIR)
@@ -109,7 +108,7 @@ public void InventoryClickEvent(InventoryClickEvent e) {
109108
player.openInventory(Inventories.MainGUI());
110109
}
111110
if (e.getCurrentItem().getType().equals(UMaterial.match("BOOK").getMaterial())) {
112-
CustomEnchant ce = rpapi.valueOfCustomEnchant(
111+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(
113112
ChatColor.stripColor(e.getCurrentItem().getItemMeta().getDisplayName()));
114113
player.closeInventory();
115114
player.openInventory(Inventories.Enchant(ce));
@@ -127,7 +126,7 @@ public void InventoryClickEvent(InventoryClickEvent e) {
127126
player.openInventory(Inventories.MainGUI());
128127
}
129128
if (e.getCurrentItem().getType().equals(UMaterial.match("BOOK").getMaterial())) {
130-
CustomEnchant ce = rpapi.valueOfCustomEnchant(
129+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(
131130
ChatColor.stripColor(e.getCurrentItem().getItemMeta().getDisplayName()));
132131
player.closeInventory();
133132
player.openInventory(Inventories.Enchant(ce));
@@ -144,7 +143,7 @@ public void InventoryClickEvent(InventoryClickEvent e) {
144143
player.openInventory(Inventories.MainGUI());
145144
}
146145
if (e.getCurrentItem().getType().equals(UMaterial.match("BOOK").getMaterial())) {
147-
CustomEnchant ce = rpapi.valueOfCustomEnchant(
146+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(
148147
ChatColor.stripColor(e.getCurrentItem().getItemMeta().getDisplayName()));
149148
player.closeInventory();
150149
player.openInventory(Inventories.Enchant(ce));
@@ -162,7 +161,7 @@ public void InventoryClickEvent(InventoryClickEvent e) {
162161
player.openInventory(Inventories.MainGUI());
163162
}
164163
if (e.getCurrentItem().getType().equals(UMaterial.match("BOOK").getMaterial())) {
165-
CustomEnchant ce = rpapi.valueOfCustomEnchant(
164+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(
166165
ChatColor.stripColor(e.getCurrentItem().getItemMeta().getDisplayName()));
167166
player.closeInventory();
168167
player.openInventory(Inventories.Enchant(ce));
@@ -179,7 +178,7 @@ public void InventoryClickEvent(InventoryClickEvent e) {
179178
player.openInventory(Inventories.MainGUI());
180179
}
181180
if (e.getCurrentItem().getType().equals(UMaterial.match("BOOK").getMaterial())) {
182-
CustomEnchant ce = rpapi.valueOfCustomEnchant(
181+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(
183182
ChatColor.stripColor(e.getCurrentItem().getItemMeta().getDisplayName()));
184183
player.closeInventory();
185184
player.openInventory(Inventories.Enchant(ce));
@@ -197,7 +196,7 @@ public void InventoryClickEvent(InventoryClickEvent e) {
197196
player.openInventory(Inventories.MainGUI());
198197
}
199198
if (e.getCurrentItem().getType().equals(UMaterial.match("BOOK").getMaterial())) {
200-
CustomEnchant ce = rpapi.valueOfCustomEnchant(
199+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(
201200
ChatColor.stripColor(e.getCurrentItem().getItemMeta().getDisplayName()));
202201
player.closeInventory();
203202
player.openInventory(Inventories.Enchant(ce));
@@ -214,8 +213,8 @@ public void InventoryClickEvent(InventoryClickEvent e) {
214213
player.openInventory(Inventories.MainGUI());
215214
}
216215
if (e.getCurrentItem().getType().equals(UMaterial.match("BOOK").getMaterial())) {
217-
CustomEnchant ce = rpapi.valueOfCustomEnchant(
218-
ChatColor.stripColor(e.getCurrentItem().getItemMeta().getDisplayName()));
216+
RPBookGUIUtils.SendDebugMessge(RPBookGUIUtils.FormatEnchantName(e.getCurrentItem()));
217+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(RPBookGUIUtils.FormatEnchantName(e.getCurrentItem()));
219218
player.closeInventory();
220219
player.openInventory(Inventories.Enchant(ce));
221220
}
@@ -224,14 +223,14 @@ public void InventoryClickEvent(InventoryClickEvent e) {
224223
/*
225224
* Enchant inv click
226225
*/
227-
CustomEnchant enchant = rpapi.valueOfCustomEnchant(invTitle);
226+
CustomEnchant enchant = RPStorage.valueOfCustomEnchant(invTitle);
228227
if (enchant != null) {
229228
e.setCancelled(true);
230229
if (e.getCurrentItem().getItemMeta().getDisplayName()
231230
.equals(ItemStacks.Back().getItemMeta().getDisplayName())
232231
&& e.getCurrentItem().getType().equals(ItemStacks.Back().clone().clone().getType())) {
233232
player.closeInventory();
234-
switch (rpapi.valueOfEnchantRarity(enchant).getIdentifier()) {
233+
switch (RPStorage.valueOfEnchantRarity(enchant).getIdentifier()) {
235234
case "SIMPLE":
236235
player.openInventory(Inventories.SimpleEnchants());
237236
break;
@@ -260,8 +259,8 @@ public void InventoryClickEvent(InventoryClickEvent e) {
260259
if (RPBookGUI.getPlugin.getConfig().getBoolean("settings.try to apply to item in hand")
261260
&& RPBookGUIUtils.isOnCorrectItem(enchant, player.getItemInHand())) {
262261

263-
CustomEnchant ce = rpapi.valueOfCustomEnchant(ci);
264-
EnchantRarity rarity = rpapi.valueOfEnchantRarity(ce);
262+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(ci);
263+
EnchantRarity rarity = RPStorage.valueOfEnchantRarity(ce);
265264

266265
ItemStack o = player.getInventory().getItemInMainHand();
267266
ItemMeta m = o.getItemMeta();
@@ -290,19 +289,19 @@ public void InventoryClickEvent(InventoryClickEvent e) {
290289

291290
for(EnchantConstructor ec : EnchantConstructor.getEnchants().values()) {
292291
if(ec.getRevealItem() != ci) {
293-
Bukkit.broadcastMessage("Removing EnchantConstructor: " + ec.getCustomEnchant().getIdentifier() + " " + ec.getEnchantLevel());
292+
RPBookGUIUtils.SendDebugMessge("Removing EnchantConstructor: " + ec.getCustomEnchant().getIdentifier() + " " + ec.getEnchantLevel());
294293
EnchantConstructor.getEnchants().remove(ec.getCustomEnchant().getIdentifier());
295294
}
296295
}
297296

298-
player.closeInventory();
299-
player.openInventory(Inventories.SuccessDestroySelection(ci));
300-
// player.getInventory().addItem(ci);
301-
// if (!RPBookGUI.getPlugin.getConfig().getBoolean("settings.keep inventory open"))
302-
// player.closeInventory();
303-
// player.sendMessage(RPBookGUIUtils
304-
// .ChatColor(RPBookGUI.getPlugin.getConfig().getString("messages.added book")
305-
// .replace("{NAME}", ci.getItemMeta().getDisplayName())));
297+
//player.closeInventory();
298+
//player.openInventory(Inventories.SuccessDestroySelection(ci));
299+
player.getInventory().addItem(ci);
300+
if (!RPBookGUI.getPlugin.getConfig().getBoolean("settings.keep inventory open"))
301+
player.closeInventory();
302+
player.sendMessage(RPBookGUIUtils
303+
.ChatColor(RPBookGUI.getPlugin.getConfig().getString("messages.added book")
304+
.replace("{NAME}", ci.getItemMeta().getDisplayName())));
306305
}
307306
}
308307
}

‎src/main/java/io/github/puyodead1/rpbookgui/Inventories.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525

2626
import io.github.puyodead1.rpbookgui.Utils.RPBookGUIUtils;
2727
import me.randomhashtags.randompackage.RandomPackageAPI;
28-
import me.randomhashtags.randompackage.addons.CustomEnchant;
29-
import me.randomhashtags.randompackage.addons.EnchantRarity;
28+
import me.randomhashtags.randompackage.addon.CustomEnchant;
29+
import me.randomhashtags.randompackage.addon.EnchantRarity;
3030
import me.randomhashtags.randompackage.api.CustomEnchants;
31+
import me.randomhashtags.randompackage.util.RPStorage;
3132

3233
public class Inventories {
3334

34-
private static RandomPackageAPI rpapi = new RandomPackageAPI();
3535
// TODO: get the round method working, round to closest multiple of 9 depending
3636
// on the number of enchants.
3737

@@ -301,17 +301,20 @@ public static Inventory HeroicEnchants(ItemStack itemApplyTo) {
301301
}
302302

303303
public static Inventory Enchant(CustomEnchant ce) {
304-
EnchantRarity rarity = rpapi.valueOfEnchantRarity(ce);
304+
EnchantRarity rarity = RPStorage.valueOfEnchantRarity(ce);
305+
RPBookGUIUtils.SendDebugMessge("CE: " + ce.toString());
306+
RPBookGUIUtils.SendDebugMessge("Name: " + ce.getName());
307+
RPBookGUIUtils.SendDebugMessge("Colors: " + rarity.getNameColors());
305308
Inventory inv = Bukkit.createInventory(null, 18, rarity.getNameColors() + ce.getName());
306309
int x = 0;
307310
for (int i = 1; i < ce.getMaxLevel() + 1; i++) {
308311
ItemStack is = CustomEnchants.getCustomEnchants().getRevealedItem(ce, i, 100, 0, true, true).clone();
309312
new EnchantConstructor(ce, rarity, i, 0, 0);
310-
Bukkit.broadcastMessage("EnchantConstructor size: " + EnchantConstructor.getEnchants().size());
313+
RPBookGUIUtils.SendDebugMessge("EnchantConstructor size: " + EnchantConstructor.getEnchants().size());
311314
inv.setItem(x, is);
312315
x++;
313316
}
314-
Bukkit.broadcastMessage("Final EnchantConstructor size: " + EnchantConstructor.getEnchants().size());
317+
RPBookGUIUtils.SendDebugMessge("Final EnchantConstructor size: " + EnchantConstructor.getEnchants().size());
315318
inv.setItem(17, ItemStacks.Back().clone());
316319
return inv;
317320
}
@@ -341,7 +344,7 @@ public static Inventory Settings() {
341344

342345
public static Inventory SuccessDestroySelection(ItemStack book) {
343346
Inventory inv = Bukkit.createInventory(null, 54, "Success & Destry Configuration");
344-
CustomEnchant ce = rpapi.valueOfCustomEnchant(book);
347+
CustomEnchant ce = RPStorage.valueOfCustomEnchant(book);
345348
// slot 10 - increase success
346349
// slot 28 - decrease success
347350
// slot 21 - book

‎src/main/java/io/github/puyodead1/rpbookgui/ItemStacks.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
import org.bukkit.inventory.meta.ItemMeta;
2727

2828
import io.github.puyodead1.rpbookgui.Utils.RPBookGUIUtils;
29+
import io.github.puyodead1.rpbookgui.Utils.UMaterial;
2930
import me.randomhashtags.randompackage.RandomPackage;
3031
import me.randomhashtags.randompackage.RandomPackageAPI;
31-
import me.randomhashtags.randompackage.addons.CustomEnchant;
32-
import me.randomhashtags.randompackage.addons.EnchantRarity;
33-
import me.randomhashtags.randompackage.utils.universal.UMaterial;
32+
import me.randomhashtags.randompackage.addon.CustomEnchant;
33+
import me.randomhashtags.randompackage.addon.EnchantRarity;
34+
import me.randomhashtags.randompackage.util.RPStorage;
3435

3536
public class ItemStacks {
3637

37-
private static RandomPackageAPI rpapi = new RandomPackageAPI();
3838

3939
public static ItemStack SimpleCategoryItem() {
4040
ItemStack item = new ItemStack(Material.BOOK);
@@ -174,15 +174,15 @@ public static ItemStack EnchantBook(CustomEnchant ce) {
174174
ItemStack item = new ItemStack(Material.BOOK);
175175
ItemMeta meta = item.getItemMeta();
176176

177-
EnchantRarity rarity = rpapi.valueOfEnchantRarity(ce);
177+
EnchantRarity rarity = RPStorage.valueOfEnchantRarity(ce);
178178

179179
meta.setDisplayName(rarity.getNameColors() + ce.getName());
180180
ArrayList<String> lore = new ArrayList<String>();
181181
lore.addAll(ce.getLore());
182182
String path = ce.getAppliesTo().toString().toLowerCase().replace(",", ";").replace("[", "").replace("]", "")
183183
.replaceAll("\\p{Z}", "");
184184
FileConfiguration config = YamlConfiguration
185-
.loadConfiguration(new File(RandomPackage.getPlugin.getDataFolder(), "custom enchants.yml"));
185+
.loadConfiguration(new File(RandomPackage.getPlugin.getDataFolder(), "custom enchants/_settings.yml"));
186186
lore.add(RPBookGUIUtils.ChatColor(config.getString("enchant types." + path)));
187187
meta.setLore(lore);
188188
item.setItemMeta(meta);

0 commit comments

Comments
 (0)