Skip to content

Commit 33592ad

Browse files
https://www.spigotmc.org/resources/shopguiplus-sellgui.85170/update?update=444083
1 parent 1676088 commit 33592ad

3 files changed

Lines changed: 18 additions & 15 deletions

File tree

build.gradle

Lines changed: 3 additions & 3 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.1'
7+
version '1.1.2'
88

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

2121
dependencies {
2222
compileOnly "org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT"
23-
compileOnly 'com.github.brcdev-minecraft:shopgui-api:2.1.1'
23+
compileOnly 'com.github.brcdev-minecraft:shopgui-api:2.2.0'
2424
compileOnly 'org.jetbrains:annotations:22.0.0'
25-
implementation "dev.triumphteam:triumph-gui:3.0.3"
25+
implementation "dev.triumphteam:triumph-gui:3.0.5"
2626
implementation 'org.bstats:bstats-bukkit:2.2.1'
2727

2828
}

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.util.concurrent.CompletableFuture;
1717
import java.util.function.Function;
1818
import java.util.logging.Logger;
19+
import java.util.stream.Collectors;
1920

2021
import org.bukkit.Bukkit;
2122
import org.bukkit.ChatColor;
@@ -267,7 +268,7 @@ private void setDecorationItems(ConfigurationSection configuration, Gui gui, Set
267268
}
268269

269270
ItemStack item = new ItemStack(material);
270-
int damage = section.getInt("damage", 0);
271+
int damage = section.getInt("item.damage", 0);
271272
if(damage != 0) {
272273
setItemDamage(item, damage);
273274
}
@@ -483,8 +484,8 @@ private void onGuiClose(Player player, InventoryCloseEvent event, Set<Integer> i
483484
formattedPricing = new StringBuilder(formattedPricing.substring(0,
484485
formattedPricing.length() - 2));
485486
}
486-
487-
StringBuilder receiptList = new StringBuilder();
487+
488+
List<String> receiptList = new ArrayList<>();
488489
StringBuilder itemList = new StringBuilder();
489490

490491

@@ -523,12 +524,12 @@ private void onGuiClose(Player player, InventoryCloseEvent event, Set<Integer> i
523524

524525
String finalItemNameFormatted = itemNameFormatted;
525526
String itemLine = getMessage("receipt_item_layout", message -> message
526-
.replace("{amount}", String.valueOf(ShopHandler.getFormattedNumber(
527-
(double)damageEntry.getValue())))
527+
.replace("{amount}", String.valueOf(damageEntry.getValue()))
528528
.replace("{item}", finalItemNameFormatted)
529529
.replace("{price}", profitsFormatted));
530-
531-
receiptList.append(itemLine).append("\n");
530+
531+
receiptList.add(itemLine);
532+
//receiptList.append(itemLine);
532533
itemList.append(itemNameFormatted).append(", ");
533534
}
534535
}
@@ -545,11 +546,12 @@ private void onGuiClose(Player player, InventoryCloseEvent event, Set<Integer> i
545546
.replace("{list}", itemList.substring(0, itemList.length()-2))
546547
.replace("{amount}", String.valueOf(finalItemAmount)));
547548
itemsSoldComponent.addExtra(" ");
548-
549-
String receiptHoverMessage = (getMessage("receipt_title", null) + receiptList);
549+
550+
String receiptHoverMessage = (getMessage("receipt_title", null) + ChatColor.RESET + receiptList.stream().collect(Collectors.joining("\n")) + ChatColor.RESET);
551+
550552
TextComponent receiptNameComponent = getTextComponentMessage("receipt_text", null);
551-
BaseComponent[] hoverEventComponents = TextComponent.fromLegacyText(receiptHoverMessage);
552-
553+
BaseComponent[] hoverEventComponents = {new TextComponent(receiptHoverMessage)};
554+
553555
@SuppressWarnings("deprecation")
554556
HoverEvent hoverEvent = new HoverEvent(Action.SHOW_TEXT, hoverEventComponents);
555557
receiptNameComponent.setHoverEvent(hoverEvent);

src/main/resources/plugin.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ 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.1"
7+
version: "1.1.2"
88
api-version: "1.13"
99

1010
authors:
1111
- "Mackenzie Molloy"
12+
- "SirBlobman"
1213

1314
depend:
1415
- "ShopGUIPlus"

0 commit comments

Comments
 (0)