Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-02 23:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from N0tMyFaultOG/master

Browse Source 
Minor fixes
This commit is contained in:
Jesse Boyd 2018-10-05 01:46:42 +10:00 committed by GitHub
commit 75c111e67a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/boydti/fawe/util/Updater.java
View File

@ -46,7 +46,7 @@ public class Updater {
Fawe.debug("Updated FAWE to " + versionString + " @ " + pendingFile);
String url = "https://empcraft.com/fawe/cl?" + Integer.toHexString(Fawe.get().getVersion().hash);
new Message().prefix().text("A FAWE update is available:")
.text("\n&8 - &a/fawe update &8 - &7Update the plugin")
.text("\n&8 - &a/fawe update &8 - &7Updates the plugin and restarts the server to apply the changes")
.cmdTip("fawe update")
.text("\n&8 - &a/fawe changelog")
.cmdTip("fawe changelog")

12
worldedit-core/src/main/java/com/sk89q/worldedit/command/OptionsCommands.java
View File

@ -264,7 +264,7 @@ public class OptionsCommands {
ItemType type = ItemTypes.get(query);
if (type != null) {
actor.print(type.getId() + " (" + type.getName() + ")");
actor.print(BBC.getPrefix() + "#" + type.getId() + " (" + type.getName() + ")");
} else {
if (query.length() <= 2) {
actor.printError("Enter a longer search string (len > 2).");
@ -272,21 +272,21 @@ public class OptionsCommands {
}
if (!blocksOnly && !itemsOnly) {
actor.print("Searching for: " + query);
actor.print(BBC.getPrefix() + "Searching for: " + query);
} else if (blocksOnly && itemsOnly) {
actor.printError("You cannot use both the 'b' and 'i' flags simultaneously.");
return;
} else if (blocksOnly) {
actor.print("Searching for blocks: " + query);
actor.print(BBC.getPrefix() + "Searching for blocks: " + query);
} else {
actor.print("Searching for items: " + query);
actor.print(BBC.getPrefix() + "Searching for items: " + query);
}
int found = 0;
for (ItemType searchType : ItemTypes.values) {
if (found >= 15) {
actor.print("Too many results!");
actor.print(BBC.getPrefix() + "Too many results!");
break;
}
@ -300,7 +300,7 @@ public class OptionsCommands {
for (String alias : Sets.newHashSet(searchType.getId(), searchType.getName())) {
if (alias.contains(query)) {
actor.print(searchType.getId() + " (" + searchType.getName() + ")");
actor.print(BBC.getPrefix() + "#" + type.getId() + " (" + type.getName() + ")");
++found;
break;
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -108,7 +108,7 @@ public abstract class BlockState implements BlockStateHolder<BlockState> {
type = BlockTypes.get(key);
if (type == null) {
String input = key.toString();
throw new SuggestInputParseException("Unkown block for " + input, input, () -> Stream.of(BlockTypes.values)
throw new SuggestInputParseException("Does not match a valid block type: " + input, input, () -> Stream.of(BlockTypes.values)
.filter(b -> b.getId().contains(input))
.map(e1 -> e1.getId())
.collect(Collectors.toList())

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
View File

@ -1055,7 +1055,7 @@ public enum BlockTypes implements BlockType {
} catch (NumberFormatException e) {
} catch (IndexOutOfBoundsException e) {}
throw new SuggestInputParseException("Unkown block for " + inputLower, inputLower, () -> Stream.of(BlockTypes.values)
throw new SuggestInputParseException("Does not match a valid block type: " + inputLower, inputLower, () -> Stream.of(BlockTypes.values)
.filter(b -> b.getId().contains(inputLower))
.map(e1 -> e1.getId())
.collect(Collectors.toList())