Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add additional config files to /ess dump #4785

Merged
merged 3 commits into from
Feb 8, 2022
Merged

Add additional config files to /ess dump #4785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b75c6c7
Add some more dump files
JRoy Jan 29, 2022
dbe42dc
Merge branch '2.x' into feat/more-dump
JRoy Feb 1, 2022
b230585
Merge branch '2.x' into feat/more-dump
JRoy Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/RandomTeleport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,8 @@ private double getNetherYAt(final Location location) {
private boolean isValidRandomLocation(final Location location) {
return location.getBlockY() > ess.getWorldInfoProvider().getMinHeight(location.getWorld()) && !this.getExcludedBiomes().contains(location.getBlock().getBiome());
}

public File getFile() {
return config.getFile();
}
}
4 changes: 4 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/Worth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ public void setPrice(final IEssentials ess, final ItemStack itemStack, final dou
config.save();
}

public File getFile() {
return config.getFile();
}

@Override
public void reloadConfig() {
config.load();
Expand Down
39 changes: 38 additions & 1 deletion Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,19 +258,26 @@ private void runDump(Server server, CommandSource sender, String commandLabel, S
files.add(new PasteUtil.PasteFile("dump.json", dump.toString()));

final Plugin essDiscord = Bukkit.getPluginManager().getPlugin("EssentialsDiscord");
final Plugin essSpawn = Bukkit.getPluginManager().getPlugin("EssentialsSpawn");

// Further operations will be heavy IO
ess.runTaskAsynchronously(() -> {
boolean config = false;
boolean discord = false;
boolean kits = false;
boolean log = false;
boolean worth = false;
boolean tpr = false;
boolean spawns = false;
for (final String arg : args) {
if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
config = true;
discord = true;
kits = true;
log = true;
worth = true;
tpr = true;
spawns = true;
break;
} else if (arg.equalsIgnoreCase("config")) {
config = true;
Expand All @@ -280,6 +287,12 @@ private void runDump(Server server, CommandSource sender, String commandLabel, S
kits = true;
} else if (arg.equalsIgnoreCase("log")) {
log = true;
} else if (arg.equalsIgnoreCase("worth")) {
worth = true;
} else if (arg.equalsIgnoreCase("tpr")) {
tpr = true;
} else if (arg.equalsIgnoreCase("spawns")) {
spawns = true;
}
}

Expand Down Expand Up @@ -319,6 +332,30 @@ private void runDump(Server server, CommandSource sender, String commandLabel, S
}
}

if (worth) {
try {
files.add(new PasteUtil.PasteFile("worth.yml", new String(Files.readAllBytes(ess.getWorth().getFile().toPath()), StandardCharsets.UTF_8)));
} catch (IOException e) {
sender.sendMessage(tl("dumpErrorUpload", "worth.yml", e.getMessage()));
}
}

if (tpr) {
try {
files.add(new PasteUtil.PasteFile("tpr.yml", new String(Files.readAllBytes(ess.getRandomTeleport().getFile().toPath()), StandardCharsets.UTF_8)));
} catch (IOException e) {
sender.sendMessage(tl("dumpErrorUpload", "tpr.yml", e.getMessage()));
}
}

if (spawns && essSpawn != null) {
try {
files.add(new PasteUtil.PasteFile("spawn.yml", new String(Files.readAllBytes(ess.getDataFolder().toPath().resolve("spawn.yml")), StandardCharsets.UTF_8)));
} catch (IOException e) {
sender.sendMessage(tl("dumpErrorUpload", "spawn.yml", e.getMessage()));
}
}

final CompletableFuture<PasteUtil.PasteResult> future = PasteUtil.createPaste(files);
future.thenAccept(result -> {
if (result != null) {
Expand Down Expand Up @@ -719,7 +756,7 @@ protected List<String> getTabCompleteOptions(final Server server, final CommandS
}
break;
case "dump":
final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "all");
final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "all");
for (String arg : args) {
if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
list.clear();
Expand Down