diff --git a/pom.xml b/pom.xml index 25c0467..37afbca 100644 --- a/pom.xml +++ b/pom.xml @@ -80,11 +80,11 @@ org.geysermc connector - 1.0.0 + 1.1.0 com.nukkitx.protocol - bedrock-v407 + bedrock-v408 2.6.0-SNAPSHOT diff --git a/src/main/java/org/geysermc/connect/GeyserConnectConfig.java b/src/main/java/org/geysermc/connect/GeyserConnectConfig.java index f811069..53bac24 100644 --- a/src/main/java/org/geysermc/connect/GeyserConnectConfig.java +++ b/src/main/java/org/geysermc/connect/GeyserConnectConfig.java @@ -29,7 +29,7 @@ package org.geysermc.connect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; -import org.geysermc.connector.utils.WebUtils; +import org.geysermc.connect.utils.WebUtils; import org.geysermc.connect.storage.AbstractStorageManager; import org.geysermc.connect.utils.Server; diff --git a/src/main/java/org/geysermc/connect/MasterServer.java b/src/main/java/org/geysermc/connect/MasterServer.java index 83a6e6e..9c34169 100644 --- a/src/main/java/org/geysermc/connect/MasterServer.java +++ b/src/main/java/org/geysermc/connect/MasterServer.java @@ -26,11 +26,9 @@ package org.geysermc.connect; import com.nukkitx.protocol.bedrock.*; -import com.nukkitx.protocol.bedrock.v390.Bedrock_v390; -import com.nukkitx.protocol.bedrock.v407.Bedrock_v407; +import com.nukkitx.protocol.bedrock.v408.Bedrock_v408; import lombok.Getter; import lombok.Setter; -import org.geysermc.connect.utils.Server; import org.geysermc.connector.utils.FileUtils; import org.geysermc.connect.proxy.GeyserProxyBootstrap; import org.geysermc.connect.storage.AbstractStorageManager; @@ -49,7 +47,7 @@ import java.util.concurrent.ScheduledExecutorService; public class MasterServer { - public static final BedrockPacketCodec CODEC = Bedrock_v407.V407_CODEC; + public static final BedrockPacketCodec CODEC = Bedrock_v408.V408_CODEC; private final Timer timer; private BedrockServer bdServer; diff --git a/src/main/java/org/geysermc/connect/utils/WebUtils.java b/src/main/java/org/geysermc/connect/utils/WebUtils.java new file mode 100644 index 0000000..cd39ea7 --- /dev/null +++ b/src/main/java/org/geysermc/connect/utils/WebUtils.java @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/GeyserConnect + */ + +package org.geysermc.connect.utils; + +import org.geysermc.connector.GeyserConnector; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class WebUtils extends org.geysermc.connector.utils.WebUtils { + /** + * Makes a web request to the given URL and returns the body as a string + * + * @param reqURL URL to fetch + * @return Body contents or error message if the request fails + */ + public static String getBody(String reqURL) { + URL url = null; + try { + url = new URL(reqURL); + HttpURLConnection con = (HttpURLConnection) url.openConnection(); + con.setRequestMethod("GET"); + con.setRequestProperty("User-Agent", "Geyser-Connect/" + GeyserConnector.VERSION); // Otherwise Java 8 fails on checking updates + + return connectionToString(con); + } catch (Exception e) { + return e.getMessage(); + } + } + + /** + * Get the string output from the passed {@link HttpURLConnection} + * + * @param con The connection to get the string from + * @return The body of the returned page + * @throws IOException + */ + private static String connectionToString(HttpURLConnection con) throws IOException { + // Send the request (we dont use this but its required for getErrorStream() to work) + int code = con.getResponseCode(); + + // Read the error message if there is one if not just read normally + InputStream inputStream = con.getErrorStream(); + if (inputStream == null) { + inputStream = con.getInputStream(); + } + + BufferedReader in = new BufferedReader(new InputStreamReader(inputStream)); + String inputLine; + StringBuffer content = new StringBuffer(); + + while ((inputLine = in.readLine()) != null) { + content.append(inputLine); + content.append("\n"); + } + + in.close(); + con.disconnect(); + + return content.toString(); + } +}