Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2024-09-28 06:27:28 +02:00
Code Issues Projects Releases Wiki Activity

improve blacklist efficiency + add modern names for legacy servers

Browse Source
This commit is contained in:
jascotty2 2019-09-10 13:21:00 -05:00
parent 71f9636e07
commit ce60a0bb98
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,9 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -56,14 +58,15 @@ import org.bukkit.plugin.PluginManager;
public class UltimateStacker extends SongodaPlugin { public class UltimateStacker extends SongodaPlugin {
private static UltimateStacker INSTANCE; private static UltimateStacker INSTANCE;
private static List<String> whitelist; private final static Set<String> whitelist = new HashSet();
private static List<String> blacklist; private final static Set<String> blacklist = new HashSet();;
private final Config mobFile = new Config(this, "mobs.yml"); private final Config mobFile = new Config(this, "mobs.yml");
private final Config itemFile = new Config(this, "items.yml"); private final Config itemFile = new Config(this, "items.yml");
private final Config spawnerFile = new Config(this, "spawners.yml"); private final Config spawnerFile = new Config(this, "spawners.yml");
private final GuiManager guiManager = new GuiManager(this); private final GuiManager guiManager = new GuiManager(this);
private final List<StackerHook> stackerHooks = new ArrayList<>();
private EntityStackManager entityStackManager; private EntityStackManager entityStackManager;
private SpawnerStackManager spawnerStackManager; private SpawnerStackManager spawnerStackManager;
private LootablesManager lootablesManager; private LootablesManager lootablesManager;
@ -76,8 +79,6 @@ public class UltimateStacker extends SongodaPlugin {
private EntityUtils entityUtils; private EntityUtils entityUtils;
private List<StackerHook> stackerHooks = new ArrayList<>();
public static UltimateStacker getInstance() { public static UltimateStacker getInstance() {
return INSTANCE; return INSTANCE;
} }
@ -101,8 +102,10 @@ public class UltimateStacker extends SongodaPlugin {
// Setup Config // Setup Config
Settings.setupConfig(); Settings.setupConfig();
this.setLocale(Settings.LANGUGE_MODE.getString(), false); this.setLocale(Settings.LANGUGE_MODE.getString(), false);
whitelist = Settings.ITEM_WHITELIST.getStringList(); blacklist.clear();
blacklist = Settings.ITEM_BLACKLIST.getStringList(); whitelist.clear();
whitelist.addAll(Settings.ITEM_WHITELIST.getStringList());
blacklist.addAll(Settings.ITEM_BLACKLIST.getStringList());
// Setup plugin commands // Setup plugin commands
this.commandManager = new CommandManager(this); this.commandManager = new CommandManager(this);
@ -250,8 +253,10 @@ public class UltimateStacker extends SongodaPlugin {
@Override @Override
public void onConfigReload() { public void onConfigReload() {
whitelist = Settings.ITEM_WHITELIST.getStringList(); blacklist.clear();
blacklist = Settings.ITEM_BLACKLIST.getStringList(); whitelist.clear();
whitelist.addAll(Settings.ITEM_WHITELIST.getStringList());
blacklist.addAll(Settings.ITEM_BLACKLIST.getStringList());
this.setLocale(getConfig().getString("System.Language Mode"), true); this.setLocale(getConfig().getString("System.Language Mode"), true);
this.locale.reloadMessages(); this.locale.reloadMessages();
@ -427,17 +432,6 @@ public class UltimateStacker extends SongodaPlugin {
return false; return false;
} }
/**
* Check to see if this material is not permitted to stack
*
* @param type Material to check
* @return true if this material will not stack
*/
public static boolean isMaterialBlacklisted(Material type) {
return !whitelist.isEmpty() && !whitelist.contains(type.name())
|| !blacklist.isEmpty() && blacklist.contains(type.name());
}
/** /**
* Check to see if this material is not permitted to stack * Check to see if this material is not permitted to stack
* *
@ -447,14 +441,36 @@ public class UltimateStacker extends SongodaPlugin {
public static boolean isMaterialBlacklisted(ItemStack item) { public static boolean isMaterialBlacklisted(ItemStack item) {
CompatibleMaterial mat = CompatibleMaterial.getMaterial(item); CompatibleMaterial mat = CompatibleMaterial.getMaterial(item);
if(mat == null) { if(mat == null) {
return true; return false;
} else if (mat.usesData()) { } else if (mat.usesData()) {
return isMaterialBlacklisted(mat.getMaterial(), mat.getData()); return isMaterialBlacklisted(mat.name()) || isMaterialBlacklisted(mat.getMaterial(), mat.getData());
} else { } else {
return isMaterialBlacklisted(mat.getMaterial()); return isMaterialBlacklisted(mat.name()) || isMaterialBlacklisted(mat.getMaterial());
} }
} }
/**
* Check to see if this material is not permitted to stack
*
* @param type Material to check
* @return true if this material will not stack
*/
public static boolean isMaterialBlacklisted(String type) {
return !whitelist.isEmpty() && !whitelist.contains(type)
|| !blacklist.isEmpty() && blacklist.contains(type);
}
/**
* Check to see if this material is not permitted to stack
*
* @param type Material to check
* @return true if this material will not stack
*/
public static boolean isMaterialBlacklisted(Material type) {
return !whitelist.isEmpty() && !whitelist.contains(type.name())
|| !blacklist.isEmpty() && blacklist.contains(type.name());
}
/** /**
* Check to see if this material is not permitted to stack * Check to see if this material is not permitted to stack
* *