Upstream
/
CrazyAuctions
mirror of https://github.com/Crazy-Crew/CrazyAuctions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up and missing merge code

This commit is contained in:
BadBones69 2019-01-25 03:08:27 -05:00
parent 8712b0bae5
commit 37c32df2fb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/badbones69/crazyauctions/Methods.java
View File

@ -15,7 +15,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.Plugin;
import java.text.NumberFormat;
import java.util.*;
public class Methods {
@ -429,4 +428,4 @@ public class Methods {
return String.valueOf(price);
}
}
}

5
src/main/java/me/badbones69/crazyauctions/controllers/GUI.java
View File

@ -22,6 +22,7 @@ import org.bukkit.plugin.Plugin;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.logging.Level;
public class GUI implements Listener {
@ -67,7 +68,7 @@ public class GUI implements Listener {
}else {
if(sell == ShopType.SELL) {
for(String l : config.getStringList("Settings.GUISettings.SellingItemLore")) {
lore.add(l.replaceAll("%Price%", Methods.getPrice(i, false)).replaceAll("%price%", Methods.getPrice(i, false)).replaceAll("%Seller%", data.getString("Items." + i + ".Seller")).replaceAll("%seller%", data.getString("Items." + i + ".Seller")).replaceAll("%Time%", Methods.convertToTime(data.getLong("Items." + i + ".Time-Till-Expire"))).replaceAll("%time%", Methods.convertToTime(data.getLong("Items." + i + ".Time-Till-Expire"))));
lore.add(l.replaceAll("%Price%", String.format(Locale.ENGLISH, "%,d", Long.parseLong(Methods.getPrice(i, false)))).replaceAll("%price%", String.format(Locale.ENGLISH, "%,d", Long.parseLong(Methods.getPrice(i, false)))).replaceAll("%Seller%", data.getString("Items." + i + ".Seller")).replaceAll("%seller%", data.getString("Items." + i + ".Seller")));
}
items.add(Methods.addLore(data.getItemStack("Items." + i + ".Item").clone(), lore));
ID.add(data.getInt("Items." + i + ".StoreID"));
@ -644,7 +645,7 @@ public class GUI implements Listener {
return;
}
}
Runnable runnable = () -> inv.setItem(slot, item);
final Runnable runnable = () -> inv.setItem(slot, item);
if(data.getString("Items." + i + ".Seller").equalsIgnoreCase(player.getName())) {
String it = config.getString("Settings.GUISettings.OtherSettings.Your-Item.Item");
String name = config.getString("Settings.GUISettings.OtherSettings.Your-Item.Name");