Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2025-02-06 15:41:20 +01:00
Code Issues Projects Releases Wiki Activity

*

Browse Source
This commit is contained in:
Jesse Boyd 2018-04-18 18:06:36 +10:00
parent 3182441e66
commit b4bb0ddc15
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/com/boydti/fawe/config/Settings.java
View File

@ -66,6 +66,7 @@ public class Settings extends Config {
@Comment("Paths for various directories") @Comment("Paths for various directories")
public static final class PATHS { public static final class PATHS {
public String TOKENS = "tokens";
@Comment({ @Comment({
"Put any minecraft or mod jars for FAWE to be aware of block textures", "Put any minecraft or mod jars for FAWE to be aware of block textures",
}) })

49
core/src/main/java/com/boydti/fawe/web/SchemSync.java
View File

@ -3,31 +3,37 @@ package com.boydti.fawe.web;
import com.boydti.fawe.Fawe; import com.boydti.fawe.Fawe;
import com.boydti.fawe.config.Settings; import com.boydti.fawe.config.Settings;
import com.boydti.fawe.util.MainUtil; import com.boydti.fawe.util.MainUtil;
import java.io.File; import com.sk89q.worldedit.LocalConfiguration;
import java.io.IOException; import com.sk89q.worldedit.WorldEdit;
import java.io.InputStream; import com.sk89q.worldedit.command.UtilityCommands;
import java.io.*;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.function.Consumer;
public class SchemSync implements Runnable { public class SchemSync implements Runnable {
private final static char PORT = 62522; private final static char PORT = 62522;
private final File tokensFile; private final File tokensFile;
private final WorldEdit worldEdit;
private final File working;
private Map<UUID, UUID> tokens; private Map<UUID, UUID> tokens;
public SchemSync() { public SchemSync() {
this.tokensFile = MainUtil.getFile(Fawe.imp().getDirectory(), Settings.IMP.PATHS.TOKENS, "TOKENS.TXT"); this.tokensFile = MainUtil.getFile(Fawe.imp().getDirectory(), Settings.IMP.PATHS.TOKENS, "TOKENS.TXT");
this.worldEdit = WorldEdit.getInstance();
LocalConfiguration config = worldEdit.getConfiguration();
this.working = worldEdit.getWorkingDirectoryFile(config.saveDir);
} }
private void loadTokens() { private void loadTokens() {
if (tokens == null) { if (tokens == null) {
String tokensDir = Settings.IMP.PATHS.TOKENS; String tokensDir = Settings.IMP.PATHS.TOKENS;
tokens = new HashMap<>(); tokens = new HashMap<>();
} }
} }
@ -49,6 +55,41 @@ public class SchemSync implements Runnable {
UUID receivedToken = new UUID(buf.getLong(), buf.getLong()); UUID receivedToken = new UUID(buf.getLong(), buf.getLong());
if (!receivedToken.equals(expectedToken)) continue; if (!receivedToken.equals(expectedToken)) continue;
try (DataInputStream dis = new DataInputStream(in)) {
File dir = new File(working, uuid.toString());
int data = dis.readByte() & 0xFF;
switch (data) {
case 0: {// list
try (DataOutputStream out = new DataOutputStream(clientSocket.getOutputStream())) {
UtilityCommands.allFiles(dir.listFiles(), true, new Consumer<File>() {
@Override
public void accept(File file) {
String path = dir.toURI().relativize(file.toURI()).getPath();
try {
out.writeUTF(path);
} catch (IOException e) {
e.printStackTrace();
}
}
});
}
break;
}
case 1: {// get
String input = dis.readUTF();
File file = new File(dir, input);
if (!MainUtil.isInSubDirectory(working, file)) {
}
if (MainUtil.isInSubDirectory(working, file) && file.exists())
break;
}
}
}
// list
// get
} }
} }