Skip to content

Commit

Permalink
Don't use CompletableFuture
Browse files Browse the repository at this point in the history
  • Loading branch information
@Andre601
Andre601 committed Jul 9, 2021
1 parent 219b49a commit ebad677
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 73 deletions.
24 changes: 6 additions & 18 deletions core/src/main/java/com/andre601/oneversionremake/core/OneVersionRemake.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.*;

public class OneVersionRemake{
Expand Down Expand Up @@ -142,25 +140,15 @@ private void load(){
}

if(!getProtocolVersionResolver().hasFile() || getConfigHandler().getBoolean(true, "Settings", "UpdateVersions")){
getProtocolVersionResolver().loadFile().whenComplete((inputStream, ex) -> {
if(ex != null){
getProxyLogger().warn("Unable to update versions.json! Encountered an exception.", ex);
return;
}

try{
Files.copy(inputStream, getProtocolVersionResolver().getFile(), StandardCopyOption.REPLACE_EXISTING);
getProxyLogger().info("Updated versions.json!");

enable();
}catch(IOException ex1){
getProxyLogger().warn("Unable to update versions.json! Encountered IOException.", ex1);
}
});
if(getProtocolVersionResolver().loadFile()){
getProxyLogger().info("Updated versions.json!");
enable();
}else{
getProxyLogger().warn("Unable to update versions.json! Check previous lines for warnings and errors.");
}
}else{
if(getProtocolVersionResolver().setupConfigurate()){
getProxyLogger().info("Loaded versions.json!");

enable();
}else{
getProxyLogger().warn("Unable to load versions.json! Check previous lines for errors and warnings.");
Expand Down
100 changes: 45 additions & 55 deletions core/src/main/java/com/andre601/oneversionremake/core/proxy/ProtocolVersionResolver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,12 @@
import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.configurate.gson.GsonConfigurationLoader;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand All @@ -45,30 +41,26 @@ public class ProtocolVersionResolver{

private final ProxyLogger logger;

public final Path file;
private final File path;
private final Path file;
private final Path path;

private ConfigurationNode node = null;

public ProtocolVersionResolver(OneVersionRemake core, Path path){
this.logger = core.getProxyLogger();

this.file = path.resolve("versions.json");
this.path = path.toFile();
this.path = path;
}

public boolean hasFile(){
return file.toFile().exists();
}

public Path getFile(){
return file;
}

public CompletableFuture<InputStream> loadFile(){
if(!path.isDirectory() && !path.mkdirs()){
public boolean loadFile(){
if(!path.toFile().isDirectory() && !path.toFile().mkdirs()){
logger.warn("Could not create folder for plugin!");
return CompletableFuture.supplyAsync(() -> null);
return false;
}

return updateCache();
Expand All @@ -89,58 +81,56 @@ public boolean setupConfigurate(){
return true;
}

public CompletableFuture<InputStream> updateCache(){
return CompletableFuture.supplyAsync(() -> {
String url = "https://raw.githubusercontent.com/Andre601/OneVersionRemake/master/versions.json";
Request request = new Request.Builder()
.url(url)
.addHeader("User-Agent", "OneVersionRemake")
.build();

try(Response response = CLIENT.newCall(request).execute()){
if(!response.isSuccessful()){
logger.warn(String.format(
"Unable to establish connection! Status-Code %d (%s) received!",
response.code(),
response.message()
));

switch(response.code()){
case 404:
logger.warn(String.format(
"The requested site (%s) does not exist. Please report this to the developer on Discord!",
url
));
break;

public boolean updateCache(){
String url = "https://raw.githubusercontent.com/Andre601/OneVersionRemake/master/versions.json";
Request request = new Request.Builder()
.url(url)
.addHeader("User-Agent", "OneVersionRemake")
.build();

try(Response response = CLIENT.newCall(request).execute()){
if(!response.isSuccessful()){
logger.warn(String.format(
"Unable to establish connection! Status-Code %d (%s) received!",
response.code(),
response.message()
));
switch(response.code()){
case 404:
logger.warn(String.format(
"The requested site (%s) does not exist. Please report this to the developer on Discord!",
url
));
break;

case 429:
logger.warn("Encountered a Rate Limit. Please delay any future Proxy Restarts to avoid this.");
break;

case 500:
logger.warn("The Site (GitHub.com) encountered an error when handling the request. Try again later...");
break;

default:
logger.warn("This is an unknown error by the plugin! Please report this to the developer on Discord!");
break;
}

return null;
}

ResponseBody body = response.body();
if(body == null){
logger.warn("GitHub.com returned an invalid/empty body!");
return null;
}

return body.byteStream();
}catch(IOException ex){
logger.warn("Encountered IOException while performing a request!", ex);
return null;
return false;
}
});

ResponseBody body = response.body();
if(body == null){
logger.warn("GitHub.com returned an invalid/empty body!");
return false;
}

Files.copy(body.byteStream(), file, StandardCopyOption.REPLACE_EXISTING);

return setupConfigurate();
}catch(IOException ex){
logger.warn("Encountered IOException while performing a request!", ex);
return false;
}
}

public String getFriendlyNames(List<Integer> protocols, boolean majorOnly){
Expand Down

0 comments on commit ebad677

Please sign in to comment.