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

Merge branch 'development' of gitlab.com:Songoda/ultimatestacker into development

This commit is contained in:
jascotty2 2019-09-19 15:29:32 -05:00
parent a71331faaa d45d3d5de5
commit 748b62bc1e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
View File

@ -401,7 +401,7 @@ public class UltimateStacker extends SongodaPlugin {
if ((blacklisted && !Settings.ITEM_HOLOGRAM_BLACKLIST.getBoolean())
|| !INSTANCE.getItemFile().getBoolean("Items." + material + ".Has Hologram")
|| !Settings.ITEM_HOLOGRAMS.getBoolean()
|| newAmount == 1 && !Settings.ITEM_HOLOGRAM_SINGLE.getBoolean())
|| newAmount < Settings.ITEM_MIN_HOLOGRAM_SIZE.getInt())
return;
item.setCustomName(name);

6
src/main/java/com/songoda/ultimatestacker/settings/Settings.java
View File

@ -160,9 +160,9 @@ public class Settings {
public static final ConfigSetting ITEM_HOLOGRAMS = new ConfigSetting(config, "Items.Holograms Enabled", true,
"Should holograms be displayed above stacked items?");
public static final ConfigSetting ITEM_HOLOGRAM_SINGLE = new ConfigSetting(config, "Items.Show Hologram For Single", true,
"Should holograms be displayed above items when there is only a single",
"item in the stack?");
public static final ConfigSetting ITEM_MIN_HOLOGRAM_SIZE = new ConfigSetting(config, "Items.Minimum Hologram Stack Size", 0,
"What should the minimum item stack size be that will show",
"holograms?");
public static final ConfigSetting ITEM_HOLOGRAM_BLACKLIST = new ConfigSetting(config, "Items.Show Holograms For Blacklisted Items", true,
"Should items that are blacklisted display holograms?");