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

Make distr operation based

Browse Source
This commit is contained in:
Matthew Miller
2018-08-19 17:53:29 +10:00
parent 9f43963379
commit 0a149a796f
5 changed files with 112 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
View File

@ -662,49 +662,40 @@ public class SelectionCommands {
int size;
boolean useData = args.hasFlag('d');
List<Countable<BlockType>> distribution = null;
List<Countable<BlockStateHolder>> distributionData = null;
List<Countable<BlockStateHolder>> distribution;
if (args.hasFlag('c')) {
// TODO: Update for new clipboard
throw new CommandException("Needs to be re-written again");
} else {
if (useData) {
distributionData = editSession.getBlockDistributionWithData(session.getSelection(player.getWorld()));
} else {
distribution = editSession.getBlockDistribution(session.getSelection(player.getWorld()));
}
distribution = editSession.getBlockDistribution(session.getSelection(player.getWorld()), !useData);
size = session.getSelection(player.getWorld()).getArea();
}
if ((useData && distributionData.size() <= 0) || (!useData && distribution.size() <= 0)) { // *Should* always be false
if (distribution.isEmpty()) { // *Should* always be false
player.printError("No blocks counted.");
return;
}
player.print("# total blocks: " + size);
if (useData) {
for (Countable<BlockStateHolder> c : distributionData) {
String name = c.getID().getBlockType().getName();
String str = String.format("%-7s (%.3f%%) %s #%s%s",
for (Countable<BlockStateHolder> c : distribution) {
String name = c.getID().getBlockType().getName();
String str;
if (useData) {
str = String.format("%-7s (%.3f%%) %s #%s",
String.valueOf(c.getAmount()),
c.getAmount() / (double) size * 100,
name,
c.getID().getBlockType().getId(),
c.getID().getStates());
player.print(str);
}
} else {
for (Countable<BlockType> c : distribution) {
String name = c.getID().getName();
String str = String.format("%-7s (%.3f%%) %s #%s",
c.getID().getAsString());
} else {
str = String.format("%-7s (%.3f%%) %s #%s",
String.valueOf(c.getAmount()),
c.getAmount() / (double) size * 100,
name,
c.getID().getId());
player.print(str);
c.getID().getBlockType().getId());
}
player.print(str);
}
}