minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Improve any/silent container commands

Browse Source 
* Merged duplicate code
* Added on/off parameters - closes #120
* Added tab completion for parameters
This commit is contained in:
Jikoo
2020-02-01 08:00:03 -05:00
parent 7d93bb06ad
commit 4f2665fedc
5 changed files with 107 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
plugin/src/main/java/com/lishid/openinv/OpenInv.java
View File

@@ -18,11 +18,10 @@ package com.lishid.openinv;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.lishid.openinv.commands.AnyChestPluginCommand;
import com.lishid.openinv.commands.ContainerSettingPluginCommand;
import com.lishid.openinv.commands.OpenInvPluginCommand;
import com.lishid.openinv.commands.SearchEnchantPluginCommand;
import com.lishid.openinv.commands.SearchInvPluginCommand;
import com.lishid.openinv.commands.SilentChestPluginCommand;
import com.lishid.openinv.internal.IAnySilentContainer;
import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialInventory;
@@ -167,50 +166,6 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
return this.accessor.getAnySilentContainer();
}
private int getLevenshteinDistance(final String string1, final String string2) {
if (string1 == null || string2 == null) {
throw new IllegalArgumentException("Strings must not be null");
}
if (string1.isEmpty()) {
return string2.length();
}
if (string2.isEmpty()) {
return string2.length();
}
if (string1.equals(string2)) {
return 0;
}
int len1 = string1.length();
int len2 = string2.length();
int[] prevDistances = new int[len1 + 1];
int[] distances = new int[len1 + 1];
for (int i = 0; i <= len1; ++i) {
prevDistances[i] = i;
}
for (int i = 1; i <= len2; ++i) {
// TODO: include tweaks available in Simmetrics?
char string2char = string2.charAt(i - 1);
distances[0] = i;
for (int j = 1; j <= len1; ++j) {
int cost = string1.charAt(j - 1) == string2char ? 0 : 1;
distances[j] = Math.min(Math.min(distances[j - 1] + 1, prevDistances[j] + 1), prevDistances[j - 1] + cost);
}
int[] swap = prevDistances;
prevDistances = distances;
distances = swap;
}
return prevDistances[len1];
}
@Override
public boolean getPlayerAnyChestStatus(@NotNull final OfflinePlayer player) {
boolean defaultState = false;
@@ -389,8 +344,14 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
this.getCommand("searchinv").setExecutor(searchInv);
this.getCommand("searchender").setExecutor(searchInv);
this.getCommand("searchenchant").setExecutor(new SearchEnchantPluginCommand(this));
this.getCommand("silentchest").setExecutor(new SilentChestPluginCommand(this));
this.getCommand("anychest").setExecutor(new AnyChestPluginCommand(this));
ContainerSettingPluginCommand settingCommand = new ContainerSettingPluginCommand(this);
PluginCommand command = this.getCommand("silentcontainer");
command.setExecutor(settingCommand);
command.setTabCompleter(settingCommand);
command = this.getCommand("anycontainer");
command.setExecutor(settingCommand);
command.setTabCompleter(settingCommand);
} else {
this.getLogger().info("Your version of CraftBukkit (" + this.accessor.getVersion() + ") is not supported.");
this.getLogger().info("If this version is a recent release, check for an update.");