Upstream
/
EpicHeads
mirror of https://github.com/songoda/EpicHeads.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Christian Koop 2022-07-07 19:30:25 +02:00
parent 6e6ffe0efc 5509da3ab1
commit 776c102e41
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>EpicHeads</artifactId> <artifactId>EpicHeads</artifactId>
<version>3.3.1</version> <version>3.3.2</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
@ -122,7 +122,7 @@
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId> <artifactId>SongodaCore</artifactId>
<version>2.6.12</version> <version>2.6.13</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
src/main/java/com/songoda/epicheads/gui/GUIOverview.java
View File

@ -96,7 +96,7 @@ public class GUIOverview extends Gui {
plugin.getLocale().getMessage("gui.overview.discord").getMessage(), plugin.getLocale().getMessage("gui.overview.discord").getMessage(),
plugin.getLocale().getMessage("gui.overview.discordlore").getMessage().split("\\|")), plugin.getLocale().getMessage("gui.overview.discordlore").getMessage().split("\\|")),
(event) -> { (event) -> {
plugin.getLocale().newMessage("&9https://discord.gg/A9TRJQb").sendPrefixedMessage(player); plugin.getLocale().newMessage("&9https://songoda.com/discord").sendPrefixedMessage(player);
exit(); exit();
}); });
} }

2
src/main/java/com/songoda/epicheads/head/Head.java
View File

@ -103,7 +103,7 @@ public class Head {
if (!free) { if (!free) {
String fcost = Settings.ECONOMY_PLUGIN.getString().equalsIgnoreCase("item") String fcost = Settings.ECONOMY_PLUGIN.getString().equalsIgnoreCase("item")
? cost + " " + Settings.ITEM_TOKEN_TYPE.getString() ? cost + " " + Settings.ITEM_TOKEN_TYPE.getString()
: EconomyManager.formatEconomy(cost); : /* EconomyManager.formatEconomy(cost) */ String.valueOf(cost); // FIXME: EconomyManager#formatEconomy etc only work in some languages (. vs ,) and only for the currency symbol $
lore.add(plugin.getLocale().getMessage("general.head.cost") lore.add(plugin.getLocale().getMessage("general.head.cost")
.processPlaceholder("cost", fcost).getMessage()); .processPlaceholder("cost", fcost).getMessage());
} }

2
src/main/resources/en_US.lang
View File

@ -20,7 +20,7 @@ general:
head: head:
staffpicked: '&8Staff Favorite' staffpicked: '&8Staff Favorite'
id: '&8ID: &7%id%' id: '&8ID: &7%id%'
cost: '&8Cost: &7%cost%' cost: '&8Cost: &7$%cost%'
gui: gui:
heads: heads:
refine: '&9Refine Search' refine: '&9Refine Search'