caskd
/
kami-blue
forked from RepoMirrors/kami-blue
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made a search command, easier to add and remove blocks from search

This commit is contained in:
willem 2020-04-20 17:06:53 +02:00
parent 80ef4bf1db
commit b095a5499b
2 changed files with 120 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/main/java/me/zeroeightsix/kami/command/commands/SearchCommand.java Normal file
View File

@ -0,0 +1,84 @@
package me.zeroeightsix.kami.command.commands;
import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
import me.zeroeightsix.kami.module.modules.render.Search;
import net.minecraft.block.Block;
import static me.zeroeightsix.kami.KamiMod.MODULE_MANAGER;
import static me.zeroeightsix.kami.util.MessageSendHelper.*;
/**
* Created by 20kdc on 17/02/2020.
* Updated by S-B99 on 17/02/20
* Modified for use with search module by wnuke on 20/04/2020
*/
public class SearchCommand extends Command {
public SearchCommand() {
super("search", new ChunkBuilder().append("help").append("+block|-block|=block").append("list|defaults|clear").build());
setDescription("Allows you to add or remove blocks from the &fSearch &7module");
}
private static final String ESP_BANNED_BLOCKS = "minecraft:air, minecraft:netherrack, minecraft:dirt, minecraft:water";
@Override
public void call(String[] args) {
Search search = MODULE_MANAGER.getModuleT(Search.class);
if (search == null) {
sendErrorMessage("&cThe module is not available for some reason. Make sure the name you're calling is correct and that you have the module installed!!");
return;
}
if (!search.isEnabled()) {
sendWarningMessage("&6Warning: The " + search.getName() + " module is not enabled!");
sendWarningMessage("These commands will still have effect, but will not visibly do anything.");
}
for (String s : args) {
if (s == null)
continue;
if (s.equalsIgnoreCase("help")) {
sendChatMessage("The " + search.getName() + " module has a list of blocks");
sendChatMessage("Normally, the " + search.getName() + " module highlights these blocks");
sendChatMessage("This command is a convenient way to quickly edit the list");
sendChatMessage("Available options: \n" +
"+block: Adds a block to the list\n" +
"-block: Removes a block from the list\n" +
"=block: Changes the list to only that block\n" +
"list: Prints the list of selected blocks\n" +
"defaults: Resets the list to the default list\n" +
"clear: Removes all blocks from the " + search.getName() + " block list");
} else if (s.equalsIgnoreCase("clear")) {
search.extClear();
sendWarningMessage("Cleared the " + search.getName() + " block list");
} else if (s.equalsIgnoreCase("defaults")) {
search.extDefaults();
sendChatMessage("Reset the " + search.getName() + " block list to default");
} else if (s.equalsIgnoreCase("list")) {
sendChatMessage("\n" + search.extGet());
} else if (s.startsWith("=")) {
String sT = s.replace("=" ,"");
search.extSet(sT);
sendChatMessage("Set the " + search.getName() + " block list to " + sT);
} else if (s.startsWith("+") || s.startsWith("-")) {
String name = s.substring(1);
Block b = Block.getBlockFromName(name);
if (b == null) {
sendChatMessage("&cInvalid block name <" + name + ">");
} else {
if (s.startsWith("+")) {
if (!ESP_BANNED_BLOCKS.contains(name)) {
sendChatMessage("Added <" + name + "> to the " + search.getName() + " block list");
search.extAdd(name);
} else {
sendChatMessage("You can't add <" + name + "> to the " + search.getName() + " block list");
}
} else {
sendChatMessage("Removed <" + name + "> from the " + search.getName() + " block list");
search.extRemove(name);
}
}
} else {
sendChatMessage("&cInvalid subcommand <" + s + ">");
}
}
}
}

51
src/main/java/me/zeroeightsix/kami/module/modules/render/Search.java
View File

@ -22,23 +22,44 @@ import static me.zeroeightsix.kami.util.LogUtil.getCurrentCoord;
@Module.Info(name = "Search", description = "Highlights blocks in the world", category = Module.Category.RENDER)
public class Search extends Module {
private static final String DEFAULT_BLOCK_ESP_CONFIG = "minecraft:portal,minecraft:end_portal_frame,minecraft:bed,";
private Setting<String> espBlockNames = register(Settings.stringBuilder("blocks").withValue(DEFAULT_BLOCK_ESP_CONFIG).withConsumer((old, value) -> refreshESPBlocksSet(value)).build());
private Setting<String> espBlockNamesAdd = register(Settings.stringBuilder("add").withValue("").withConsumer((old, value) -> addBlockToSearch(value)).build());
private Setting<String> espBlockNamesDel = register(Settings.stringBuilder("del").withValue("").withConsumer((old, value) -> removeBlockFromSearch(value)).build());
public void addBlockToSearch(String block) {
espBlockNames.setValue(espBlockNames.getValue() + block + ",");
refreshESPBlocksSet(espBlockNames.getValue());
}
public void removeBlockFromSearch(String block) {
espBlockNames.setValue(espBlockNames.getValue().replace(block + ",", ""));
refreshESPBlocksSet(espBlockNames.getValue());
}
Minecraft mc = Minecraft.getMinecraft();
private Set<Block> espBlocks;
private static final String DEFAULT_BLOCK_ESP_CONFIG = "minecraft:portal, minecraft:end_portal_frame, minecraft:bed";
private Setting<String> espBlockNames = register(Settings.stringBuilder("HiddenBlocks").withValue(DEFAULT_BLOCK_ESP_CONFIG).withConsumer((old, value) -> refreshESPBlocksSet(value)).build());
public String extGet() {
return extGetInternal(null);
}
// Add entry by arbitrary user-provided string
public void extAdd(String s) {
espBlockNames.setValue(extGetInternal(null) + ", " + s);
}
// Remove entry by arbitrary user-provided string
public void extRemove(String s) {
espBlockNames.setValue(extGetInternal(Block.getBlockFromName(s)));
}
// Clears the list.
public void extClear() {
espBlockNames.setValue("");
}
// Resets the list to default
public void extDefaults() { extClear(); extAdd(DEFAULT_BLOCK_ESP_CONFIG); }
// Set the list to 1 value
public void extSet(String s) { extClear(); extAdd(s); }
private String extGetInternal(Block filter) {
StringBuilder sb = new StringBuilder();
boolean notFirst = false;
for (Block b : espBlocks) {
if (b == filter)
continue;
if (notFirst)
sb.append(", ");
notFirst = true;
sb.append(Block.REGISTRY.getNameForObject(b));
}
return sb.toString();
}
@Override
public void onUpdate() {