Optimize skin requests

This commit is contained in:
mathiascode 2019-09-28 21:22:18 +03:00
parent 2c6e2a8b31
commit 1796124bc1
5 changed files with 121 additions and 124 deletions

View file

@ -1,9 +1,11 @@
package pw.kaboom.extras;
import java.io.InputStreamReader;
import java.net.URL;
import javax.net.ssl.HttpsURLConnection;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandlers;
import java.net.URI;
import org.bukkit.ChatColor;
@ -33,53 +35,53 @@ class CommandUsername implements CommandExecutor {
if (args.length == 0) {
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <username>");
} else {
final String[] name = args;
new BukkitRunnable() {
public void run() {
} else if (!Main.usernameInProgress.contains(player.getUniqueId())) {
Main.usernameInProgress.add(player.getUniqueId());
final String nameColor = ChatColor.translateAlternateColorCodes('&', String.join(" ", args));
final String nameShort = nameColor.substring(0, Math.min(16, nameColor.length()));
HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create("https://api.ashcon.app/mojang/v2/user/" + nameShort))
.build();
client.sendAsync(request, BodyHandlers.ofInputStream())
.thenAccept(response -> {
String texture = "";
String signature = "";
if (response.statusCode() == 200) {
final InputStreamReader skinStream = new InputStreamReader(response.body());
final JsonObject responseJson = new JsonParser().parse(skinStream).getAsJsonObject();
final JsonObject rawSkin = responseJson.getAsJsonObject("textures").getAsJsonObject("raw");
texture = rawSkin.get("value").getAsString();
signature = rawSkin.get("signature").getAsString();
try {
String texture = "";
String signature = "";
final String nameColor = ChatColor.translateAlternateColorCodes('&', String.join(" ", name));
final String nameShort = nameColor.substring(0, Math.min(16, nameColor.length()));
final URL skinUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + nameShort);
final HttpsURLConnection skinConnection = (HttpsURLConnection) skinUrl.openConnection();
skinConnection.setConnectTimeout(0);
skinConnection.setDefaultUseCaches(false);
skinConnection.setUseCaches(false);
if (skinConnection.getResponseCode() == HttpsURLConnection.HTTP_OK) {
final InputStreamReader skinStream = new InputStreamReader(skinConnection.getInputStream());
final JsonObject response = new JsonParser().parse(skinStream).getAsJsonObject();
final JsonObject rawSkin = response.getAsJsonObject("textures").getAsJsonObject("raw");
texture = rawSkin.get("value").getAsString();
signature = rawSkin.get("signature").getAsString();
skinStream.close();
}
skinConnection.disconnect();
final PlayerProfile profile = player.getPlayerProfile();
profile.setName(nameShort);
if (!("".equals(texture)) &&
!("".equals(signature))) {
profile.setProperty(new ProfileProperty("textures", texture, signature));
}
player.sendMessage("Successfully set your username to \"" + nameShort + "\"");
new BukkitRunnable() {
public void run() {
player.setPlayerProfile(profile);
}
}.runTask(JavaPlugin.getPlugin(Main.class));
skinStream.close();
} catch (Exception exception) {
System.out.println(exception);
}
}
}.runTaskAsynchronously(JavaPlugin.getPlugin(Main.class));
final PlayerProfile profile = player.getPlayerProfile();
profile.setName(nameShort);
if (!("".equals(texture)) &&
!("".equals(signature))) {
profile.setProperty(new ProfileProperty("textures", texture, signature));
}
player.sendMessage("Successfully set your username to \"" + nameShort + "\"");
new BukkitRunnable() {
public void run() {
player.setPlayerProfile(profile);
Main.usernameInProgress.remove(player.getUniqueId());
}
}.runTask(JavaPlugin.getPlugin(Main.class));
});
} else {
player.sendMessage("Your username is already being changed. Please wait a few seconds.");
}
}
return true;