kaboomserver/extras
1
0
Fork 0
mirror of https://github.com/kaboomserver/extras.git synced 2024-05-16 09:51:18 +00:00
Code Issues Projects Releases Wiki Activity

Optimize skin requests

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pom.xml
View file

@ -4,8 +4,8 @@
<artifactId>Extras</artifactId>
<version>master</version>
<properties>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
</properties>
@ -15,11 +15,6 @@
<artifactId>paper-api</artifactId>
<version>1.13.2-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.4.0</version>
</dependency>
</dependencies>
<repositories>
@ -27,10 +22,6 @@
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/nexus/repository/public/</url>
</repository>
</repositories>
<build>

2
src/main/java/pw/kaboom/extras/Main.java
View file

@ -13,6 +13,8 @@ import com.destroystokyo.paper.profile.PlayerProfile;
public class Main extends JavaPlugin {
static int fallingBlockCount;
static HashSet<UUID> skinInProgress = new HashSet<>();
static HashSet<UUID> usernameInProgress = new HashSet<>();
static HashMap<UUID, Long> commandMillisList = new HashMap<>();
static HashMap<UUID, Long> interactMillisList = new HashMap<>();
static HashSet<String> consoleCommandBlacklist = new HashSet<>();

76
src/main/java/pw/kaboom/extras/commands/CommandSkin.java
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,43 +35,45 @@ class CommandSkin implements CommandExecutor {
if (args.length == 0) {
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <username>");
} else {
final String name = args[0];
new BukkitRunnable() {
public void run() {
} else if (!Main.skinInProgress.contains(player.getUniqueId())) {
Main.skinInProgress.add(player.getUniqueId());
HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create("https://api.ashcon.app/mojang/v2/user/" + args[0]))
.build();
client.sendAsync(request, BodyHandlers.ofInputStream())
.thenAccept(response -> {
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");
final String texture = rawSkin.get("value").getAsString();
final String signature = rawSkin.get("signature").getAsString();
try {
final URL skinUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + name);
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");
final String texture = rawSkin.get("value").getAsString();
final String signature = rawSkin.get("signature").getAsString();
skinStream.close();
final PlayerProfile textureProfile = player.getPlayerProfile();
textureProfile.setProperty(new ProfileProperty("textures", texture, signature));
player.sendMessage("Successfully set your skin to " + name + "'s");
new BukkitRunnable() {
public void run() {
player.setPlayerProfile(textureProfile);
}
}.runTask(JavaPlugin.getPlugin(Main.class));
} else {
player.sendMessage("A player with that username doesn't exist");
}
skinConnection.disconnect();
skinStream.close();
} catch (Exception exception) {
System.out.println(exception);
}
final PlayerProfile profile = player.getPlayerProfile();
profile.setProperty(new ProfileProperty("textures", texture, signature));
player.sendMessage("Successfully set your skin to " + args[0] + "'s");
new BukkitRunnable() {
public void run() {
player.setPlayerProfile(profile);
Main.skinInProgress.remove(player.getUniqueId());
}
}.runTask(JavaPlugin.getPlugin(Main.class));
} else {
player.sendMessage("A player with that username doesn't exist");
Main.skinInProgress.remove(player.getUniqueId());
}
}.runTaskAsynchronously(JavaPlugin.getPlugin(Main.class));
});
} else {
player.sendMessage("You are already applying a skin. Please wait a few seconds.");
}
}
return true;

94
src/main/java/pw/kaboom/extras/commands/CommandUsername.java
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;

60
src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
View file

@ -1,11 +1,13 @@
package pw.kaboom.extras;
import java.io.InputStreamReader;
import java.net.URL;
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 java.util.UUID;
import javax.net.ssl.HttpsURLConnection;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
@ -123,37 +125,33 @@ class PlayerConnection implements Listener {
event.allow();
player.setOp(true);
new BukkitRunnable() {
public void run() {
HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create("https://api.ashcon.app/mojang/v2/user/" + player.getName()))
.build();
client.sendAsync(request, BodyHandlers.ofInputStream())
.thenAccept(response -> {
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");
final String texture = rawSkin.get("value").getAsString();
final String signature = rawSkin.get("signature").getAsString();
try {
final URL skinUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + player.getName());
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");
final String texture = rawSkin.get("value").getAsString();
final String signature = rawSkin.get("signature").getAsString();
skinStream.close();
final PlayerProfile textureProfile = player.getPlayerProfile();
textureProfile.setProperty(new ProfileProperty("textures", texture, signature));
new BukkitRunnable() {
public void run() {
player.setPlayerProfile(textureProfile);
}
}.runTask(JavaPlugin.getPlugin(Main.class));
}
skinConnection.disconnect();
skinStream.close();
} catch (Exception exception) {
System.out.println(exception);
}
final PlayerProfile profile = player.getPlayerProfile();
profile.setProperty(new ProfileProperty("textures", texture, signature));
new BukkitRunnable() {
public void run() {
player.setPlayerProfile(profile);
}
}.runTask(JavaPlugin.getPlugin(Main.class));
}
}.runTaskAsynchronously(JavaPlugin.getPlugin(Main.class));
});
}
}