Skip to content
GitLab
Commit 9930e0e1 authored by kellerkindt's avatar kellerkindt
Browse files

Further HoverText adjustments

parent 8ae32963
Hide whitespace changes
Inline Side-by-side
src/com/kellerkindt/scs/Properties.java
View file @ 9930e0e1
......@@ -58,7 +58,7 @@ public class Properties {
// don't forget to update these versions on locale, storage or shop changes
public static final double VERSION_LOCALE = 3.22;
public static final double VERSION_LOCALE = 3.3;
public static final int VERSION_STORAGE_SHOP = 7;
public static final int VERSION_STORAGE_PRICE = 1;
public static final int VERSION_SESSION = 1;
......
src/com/kellerkindt/scs/internals/SimpleShopHandler.java
View file @ 9930e0e1
......@@ -772,12 +772,15 @@ public class SimpleShopHandler implements ShopHandler, Listener {
}
// mark player text differently so one can distinguish between original SCS price and fake price
item.setCustomName(ChatColor.YELLOW+"["+hoverText+"]");
item.setCustomName(ChatColor.GOLD+"["+hoverText+"]");
item.setCustomNameVisible(true);
} else {
item.setCustomName(ChatColor.GREEN+shop.getHoverText());
if (shop.getHoverText() != null && shop.getHoverText().length() > 0) {
item.setCustomName(shop.getHoverText());
item.setCustomNameVisible(true);
}
}
item.setCustomNameVisible(true);
}
// System.out.println("droppedItem, Item-id: "+item.getEntityId()+", loc="+shop.getLocation()+", world="+shop.getWorld().getName());
......
src/com/kellerkindt/scs/shops/BuyShop.java
View file @ 9930e0e1
......@@ -27,6 +27,7 @@ import com.kellerkindt.scs.internals.NamedUUID;
import com.kellerkindt.scs.utilities.MaterialNames;
import com.kellerkindt.scs.utilities.Term;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.configuration.serialization.SerializableAs;
......@@ -81,7 +82,7 @@ public class BuyShop<T extends BuyShop<?>> extends Shop<T> {
@Override
public String getHoverText() {
return getHoverText(Term.SHOP_ITEM_CUSTOM_NAME_TYPE_BUY);
return ChatColor.GREEN+getHoverText(Term.SHOP_ITEM_CUSTOM_NAME_TYPE_BUY);
}
/**
......
src/com/kellerkindt/scs/shops/ExchangeShop.java
View file @ 9930e0e1
......@@ -23,6 +23,7 @@ import com.kellerkindt.scs.internals.NamedUUID;
import com.kellerkindt.scs.utilities.MaterialNames;
import com.kellerkindt.scs.utilities.Term;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.configuration.serialization.SerializableAs;
......@@ -87,7 +88,7 @@ public class ExchangeShop<T extends ExchangeShop<?>> extends Shop<T> {
@Override
protected String getHoverText(Term term, List<String> parameters) {
parameters.add(MaterialNames.getItemName(getExchangeItemStack()));
return super.getHoverText(term, parameters);
return ChatColor.AQUA+super.getHoverText(term, parameters);
}
/**
......
src/com/kellerkindt/scs/shops/SellShop.java
View file @ 9930e0e1
......@@ -23,6 +23,7 @@ import com.kellerkindt.scs.internals.NamedUUID;
import com.kellerkindt.scs.utilities.MaterialNames;
import com.kellerkindt.scs.utilities.Term;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.configuration.serialization.SerializableAs;
......@@ -71,7 +72,7 @@ public class SellShop extends Shop {
@Override
public String getHoverText() {
return getHoverText(Term.SHOP_ITEM_CUSTOM_NAME_TYPE_SELL);
return ChatColor.YELLOW+getHoverText(Term.SHOP_ITEM_CUSTOM_NAME_TYPE_SELL);
}
/**
......
src/locale_DE.yml
View file @ 9930e0e1
......@@ -173,10 +173,10 @@ HELP_ADMIN_3: "`g/scs enable `G- aktiviert alle S
HELP_ADMIN_4: "`g/scs import [file/minidb/showcase/ffss] `G- Importiert ShowCase."
HELP_ADMIN_5: "`g/scs reload `G- Laedt alle ShowCase erneut."
HELP_ADMIN_6: "`g/scs destroy `G- Zerstoert ein Showcase ohne die Items zu erhalten."
HELP_ADMIN_7: "`g/scs list <spielername> `G- Listet details �ber einen Spieler auf"
HELP_ADMIN_7: "`g/scs list <spielername> `G- Listet details über einen Spieler auf"
HELP_ADMIN_8: "`g/scs purge <w:weltname|spielername> {weltname|*} `G- Loescht alle ShowCases eines Spielers auf der angegebenen Welt"
HELP_ADMIN_9: "`g/scs report `G- Erstellt eine Datei die benoetigt wird, falls du ein Support-Ticket erstellst"
HELP_ADMIN_10: "`g/scs repair `G- Sucht und repariert besch�digte ShowCases"
HELP_ADMIN_10: "`g/scs repair `G- Sucht und repariert beschädigte ShowCases"
HELP_TITLE: "`B<|------------ `bShow`YCase`RStandalone `gHelp %1/2 `B-----------|>"
HELP_TITLE_ADMIN: "`B<|----------- `bShow`YCase`RStandalone `gAdmin Help `B----------|>"
......@@ -205,12 +205,12 @@ INFO_UNDO_6: "`GEinzelpreis: `Y%1 `GTransaktions
INFO_UNDO_7: "`GRestzeit um die Transaktion rueckgaengig zu machen: `Y%1 `G Sekunden."
INFO_UNDO_8: "`GTransaktion kann nicht rueckgaengig gemacht werden (Zeit abgelaufen)."
REPAIR_INFO: "`y%1`g besch�digte ShowCases gefunden."
REPAIR_INFO: "`y%1`g beschädigte ShowCases gefunden."
REPAIR_HELP_1: "`gBenutze /scs repair restore um `y%1`g ShowCases wiederherzustellen."
REPAIR_HELP_2: "`gBenutze /scs repair delete um `y%1`g ShowCases zu l�schen."
REPAIR_HELP_2: "`gBenutze /scs repair delete um `y%1`g ShowCases zu löschen."
RESTORE_START: "`yStelle ShowCases wieder her..."
RESTORE_END: "`gWiederherstellung von %1 ShowCases beendet."
DELETE_START: "`yL�sche ShowCases."
DELETE_START: "`yLösche ShowCases."
DELETE_END: "`g%1 ShowCases wurden gel�scht"
......@@ -224,8 +224,9 @@ DELETE_END: "`g%1 ShowCases wurden gel�scht"
## %4 shop type
## %5 shop amount
## %6 whether unlimited
## %7 exchange material name (only on exchange)
##
SHOP_ITEM_CUSTOM_NAME_TYPE_SELL: "Verkaufe %1 fuer jeweils %2"
SHOP_ITEM_CUSTOM_NAME_TYPE_BUY: "Kaufe %1 fuer jeweils %2"
SHOP_ITEM_CUSTOM_NAME_TYPE_EXCHANGE: "Tausche %1"
SHOP_ITEM_CUSTOM_NAME_TYPE_DISPLAY: "Zeige %1"
\ No newline at end of file
SHOP_ITEM_CUSTOM_NAME_TYPE_SELL: "%2"
SHOP_ITEM_CUSTOM_NAME_TYPE_BUY: "%2"
SHOP_ITEM_CUSTOM_NAME_TYPE_EXCHANGE: "%2"
SHOP_ITEM_CUSTOM_NAME_TYPE_DISPLAY: ""
\ No newline at end of file
src/locale_EN.yml
View file @ 9930e0e1
......@@ -225,8 +225,9 @@ DELETE_END: "`gDeleted %1 damaged ShowCases."
## %4 shop type
## %5 shop amount
## %6 whether unlimited
## %7 exchange material name (only on exchange)
##
SHOP_ITEM_CUSTOM_NAME_TYPE_SELL: "Selling %1 for %2 each"
SHOP_ITEM_CUSTOM_NAME_TYPE_BUY: "Buying %1 for %2 each"
SHOP_ITEM_CUSTOM_NAME_TYPE_EXCHANGE: "Trading %1"
SHOP_ITEM_CUSTOM_NAME_TYPE_DISPLAY: "Displaying %1"
\ No newline at end of file
SHOP_ITEM_CUSTOM_NAME_TYPE_SELL: "%2"
SHOP_ITEM_CUSTOM_NAME_TYPE_BUY: "%2"
SHOP_ITEM_CUSTOM_NAME_TYPE_EXCHANGE: "%2"
SHOP_ITEM_CUSTOM_NAME_TYPE_DISPLAY: ""
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment