aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java18
-rw-r--r--src/Java/gtPlusPlus/core/config/ConfigHandler.java3
-rw-r--r--src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java15
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java9
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java12
-rw-r--r--src/Java/gtPlusPlus/core/util/sys/GeoUtils.java119
-rw-r--r--src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java99
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java4
8 files changed, 0 insertions, 279 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 0df731c548..a11f693514 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -2,7 +2,6 @@ package gtPlusPlus;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTurbines;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableUpdateChecker;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -42,10 +41,7 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.data.LocaleUtils;
import gtPlusPlus.core.util.minecraft.HazmatUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.core.util.sys.GeoUtils;
-import gtPlusPlus.core.util.sys.NetworkUtils;
import gtPlusPlus.core.util.sys.SystemUtils;
import gtPlusPlus.plugin.manager.Core_Manager;
import gtPlusPlus.xmod.gregtech.api.objects.GregtechBufferThread;
@@ -165,14 +161,6 @@ public class GTplusplus implements ActionListener {
setupMaterialBlacklist();
// setupMaterialWhitelist();
- // HTTP Requests
- if (CORE.ConfigSwitches.enableUpdateChecker) {
- CORE.MASTER_VERSION = NetworkUtils.getContentFromURL(
- "https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt"
- ).toLowerCase();
- CORE.USER_COUNTRY = GeoUtils.determineUsersCountry();
- }
-
// Handle GT++ Config
ConfigHandler.handleConfigFile(event);
@@ -180,12 +168,6 @@ public class GTplusplus implements ActionListener {
CORE.DEVENV = (Boolean) Launch.blackboard.get(
"fml.deobfuscatedEnvironment"
);
- if (enableUpdateChecker) {
- Logger.INFO(
- "Latest is " + CORE.MASTER_VERSION + ". Updated? "
- + Utils.isModUpToDate()
- );
- }
// Utils.LOG_INFO("User's Country: " + CORE.USER_COUNTRY);
Utils.registerEvent(new LoginEventHandler());
diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index 0760dfc2cc..f5f4d502a1 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -18,9 +18,6 @@ public class ConfigHandler {
new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
config.load();
- enableUpdateChecker = config.getBoolean("enableUpdateChecker", "debug", true,
- "Stops mod checking for updates.");
-
// Debug
/* DEBUG = config.getBoolean("debugMode", "debug", false,
"Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");*/
diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
index fbeca72090..1a8d87882e 100644
--- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -50,21 +50,6 @@ public class LoginEventHandler {
//Populates player cache
if (!this.localPlayerRef.worldObj.isRemote){
PlayerCache.appendParamChanges(this.localPlayersName, this.localPlayersUUID.toString());
-
- if (CORE.ConfigSwitches.enableUpdateChecker){
- if (!Utils.isModUpToDate()){
- Logger.INFO("[GT++] You're not using the latest recommended version of GT++, consider updating.");
- if (!CORE.MASTER_VERSION.toLowerCase().equals("offline")) {
- Logger.INFO("Latest version is: "+CORE.MASTER_VERSION);
- }
- Logger.INFO("You currently have: "+CORE.VERSION);
- ShortTimer(this.localPlayerRef, 20);
- }
- else {
- Logger.INFO("You're using the latest recommended version of GT++.");
- }
- }
-
}
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 9e29a381e2..f9f3c9ed3c 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -12,8 +12,6 @@ import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.api.objects.random.XSTR;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.core.util.sys.GeoUtils;
-import gtPlusPlus.core.util.sys.NetworkUtils;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
@@ -55,9 +53,6 @@ public class CORE {
public static final String name = "GT++";
public static final String MODID = "miscutils";
public static final String VERSION = "1.7.05";
- public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
- public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
- public static boolean isModUpToDate = Utils.isModUpToDate();
//Tweakables
public static int EVERGLADES_ID = 227;
@@ -181,10 +176,6 @@ public class CORE {
*/
public static class ConfigSwitches {
-
- //Updates
- public static boolean enableUpdateChecker = true;
-
//Debug
public static boolean disableEnderIOIntegration = false;
public static boolean disableEnderIOIngotTooltips = false;
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 982c55282e..81b23e0b1c 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -92,18 +92,6 @@ public class Utils {
}
}
- public static boolean isModUpToDate() {
- if (CORE.MASTER_VERSION.toLowerCase().equals("offline")) {
- return false;
- }
-
- else if (CORE.MASTER_VERSION.toLowerCase().equals(CORE.VERSION.toLowerCase())) {
- return true;
- } else {
- return false;
- }
- }
-
public static TC_AspectStack getTcAspectStack(final TC_Aspects aspect, final long size) {
return getTcAspectStack(aspect.name(), (int) size);
}
diff --git a/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java b/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
deleted file mode 100644
index 0e5a33b948..0000000000
--- a/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package gtPlusPlus.core.util.sys;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.http.client.utils.URIBuilder;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.preloader.CORE_Preloader;
-
-public class GeoUtils {
-
- public static String determineUsersCountry(){
- if (!CORE_Preloader.DEBUG_MODE && !CORE.DEVENV) {
- try {
- if (NetworkUtils.checkNetworkIsAvailableWithValidInterface()){
- return getUsersCountry();
- }
- else {
- return "Offline.";
- }
- } catch (Throwable T){
- Logger.INFO("Failed to initialise GeoUtils.");
- return "Failed.";
- }
- }
- else {
- return "Debug/Dev";
- }
- }
-
- private static String getUsersIPAddress() {
- try {
- String webPage = "http://checkip.amazonaws.com/";
- URL url = new URL(webPage);
- URLConnection urlConnection = url.openConnection();
- InputStream is = urlConnection.getInputStream();
- InputStreamReader isr = new InputStreamReader(is);
- int numCharsRead;
- char[] charArray = new char[1024];
- StringBuffer sb = new StringBuffer();
- while ((numCharsRead = isr.read(charArray)) > 0) {
- sb.append(charArray, 0, numCharsRead);
- }
- isr.close();
- String result = sb.toString();
- return result;
- } catch (IOException e) {}
- return "Error getting users IP.";
- }
-
- private static String getUsersCountry() {
-
- //Get the IP
- String ipAddress = getUsersIPAddress();
-
- //Build a URL
- URIBuilder builder = new URIBuilder()
- .setScheme("http")
- .setHost("ipinfo.io")
- .setPath("/"+ipAddress+"/country/");
-
- URI uri;
- try {
- //Convert the URI Builder to a URI, then to a URL
- uri = builder.build();
- URL url = uri.toURL();
-
- //Main Check method
- try {
- URLConnection urlConnection = url.openConnection();
- InputStream is = urlConnection.getInputStream();
- InputStreamReader isr = new InputStreamReader(is);
- int numCharsRead;
- char[] charArray = new char[1024];
- StringBuffer sb = new StringBuffer();
- while ((numCharsRead = isr.read(charArray)) > 0) {
- sb.append(charArray, 0, numCharsRead);
- }
- String temp = sb.toString();
- String result = temp.replaceAll("(\\r|\\n)", "");
- isr.close();
- return result;
- //Catch block for bad connection
- } catch (IOException e) {
- Logger.INFO("Method 1 - Failed.");
- }
-
- //Secondary method
- try (java.util.Scanner s = new java.util.Scanner(url.openStream(), "UTF-8").useDelimiter("\\A")) {
- String r = s.next();
- return r.replaceAll("(\\r|\\n)", "");
- //Catch block for bad connection
- } catch (java.io.IOException e) {
- Logger.INFO("Method 2 - Failed.");
- }
-
- }
- //Catch block for all the Bad URI/URL building
- catch (URISyntaxException | MalformedURLException e1) {
- if (e1 instanceof URISyntaxException){
- Logger.INFO("Bad URI Syntax for builder.");
- }
- else {
- Logger.INFO("Malformed URL.");
- }
- Logger.INFO("Country Check - Failed.");
- }
- return "Error getting users Country. "+ipAddress;
- }
-
-}
diff --git a/src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java b/src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java
deleted file mode 100644
index 1403713b3d..0000000000
--- a/src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package gtPlusPlus.core.util.sys;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.*;
-import java.util.Enumeration;
-
-import gtPlusPlus.api.objects.Logger;
-
-public class NetworkUtils {
-
- public static String getContentFromURL(final String args) {
- if (checkNetworkIsAvailableWithValidInterface()){
- try {
- URL url;
- // get URL content
- url = new URL(args);
- final URLConnection conn = url.openConnection();
- // open the stream and put it into BufferedReader
- final BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
- String inputLine;
- String tempLine = null;
- while ((inputLine = br.readLine()) != null) {
- tempLine = inputLine;
- }
- br.close();
- return tempLine;
- }
- catch (final MalformedURLException e) {
- Logger.INFO("Bad URL for Version Check.");
- }
- catch (final IOException e) {
- Logger.INFO("IOException during Version Check.");
- }
- }
- Logger.INFO("Network Not Available during Version Check.");
- return "offline";
- }
-
- public static boolean checkNetworkIsAvailableWithValidInterface(){
- try {
- if (hasValidNetworkInterface()){
- if (checkAddressWithTimeout("http://www.google.com", 100) ||
- checkAddressWithTimeout("http://www.baidu.com", 100) ||
- checkAddressWithTimeout("http://www.github.com/alkcorp/GTplusplus", 100) ||
- checkAddressWithTimeout("http://www.yahoo.com", 100)/* ||
- netIsAvailableGoogle() ||
- netIsAvailableBaidu() ||
- netIsAvailableGithub() ||
- netIsAvailableOther()*/){
- return true;
- }
- else {
- Logger.INFO("No sites responded to network connectivity test.");
- }
- }
- else {
- Logger.INFO("Network Adapter was not valid.");
- }
- }
- catch (SocketException e) {}
- return false;
- }
-
- private static boolean checkAddressWithTimeout(String URL, int timeout) {
-
- try {
- InetAddress.getByName(URL).isReachable(timeout); //Replace with your name
- return true;
- } catch (Exception e) {
- boolean result = false;
- try {
- URL urlObj = new URL(URL);
- HttpURLConnection con = (HttpURLConnection) urlObj.openConnection();
- con.setRequestMethod("GET");
- con.setConnectTimeout(timeout);
- con.connect();
- int code = con.getResponseCode();
- if (code == 200) {
- result = true;
- }
- } catch (Exception e2) {}
- return result;
- }
- }
-
- private static boolean hasValidNetworkInterface() throws SocketException{
- final Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
- while (interfaces.hasMoreElements()) {
- final NetworkInterface interf = interfaces.nextElement();
- if (interf.isUp() && !interf.isLoopback()) {
- return true;
- }
- }
- return false;
- }
-
-}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index 73a60889c6..49537ab559 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -21,7 +21,6 @@ import gtPlusPlus.core.proxy.ClientProxy;
import gtPlusPlus.core.util.data.AES;
import gtPlusPlus.core.util.data.FileUtils;
import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.sys.NetworkUtils;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.entity.RenderManager;
@@ -338,9 +337,6 @@ public class GTPP_CapeRenderer extends RenderPlayer {
}
private static final void downloadCapeList() {
- if (!NetworkUtils.checkNetworkIsAvailableWithValidInterface()) {
- return;
- }
try {
File dat = getCapeCache();
File temp = allocateTempFile();
generated by cgit (git 2.46.0) at 2025-03-09 17:30:55 +0000