aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/gregtech/common/GT_Client.java26
-rw-r--r--src/main/java/gregtech/common/render/GT_CapeRenderer.java6
2 files changed, 17 insertions, 15 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index b54c3e3e83..e58669e1cc 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -232,6 +232,19 @@ public class GT_Client extends GT_Proxy
public void run() {
try {
+ GT_Log.out.println("GT_Mod: Downloading Cape List.");
+ @SuppressWarnings("resource")
+ Scanner tScanner = new Scanner(new URL("http://files.minecraftforge.net/maven/com/gregoriust/gregtech/capelist.txt").openStream());
+ while (tScanner.hasNextLine()) {
+ String tName = tScanner.nextLine();
+ if (!this.mCapeList.contains(tName.toLowerCase())) {
+ this.mCapeList.add(tName.toLowerCase());
+ }
+ }
+ } catch (Throwable e) {
+ }
+
+ try {
GT_Log.out.println("GT New Horizons: Downloading Cape List.");
@SuppressWarnings("resource")
Scanner tScanner = new Scanner(new URL("https://raw.githubusercontent.com/GTNewHorizons/CustomGTCapeHook-Cape-List/master/capes.txt").openStream());
@@ -253,18 +266,7 @@ public class GT_Client extends GT_Proxy
} catch (Throwable e) {
}
- try {
- GT_Log.out.println("GT_Mod: Downloading Cape List.");
- @SuppressWarnings("resource")
- Scanner tScanner = new Scanner(new URL("http://files.minecraftforge.net/maven/com/gregoriust/gregtech/capelist.txt").openStream());
- while (tScanner.hasNextLine()) {
- String tName = tScanner.nextLine();
- if (!this.mCapeList.contains(tName.toLowerCase())) {
- this.mCapeList.add(tName.toLowerCase());
- }
- }
- } catch (Throwable e) {
- }
+
try {
GT_Log.out.println("GT_Mod: Downloading News.");
@SuppressWarnings("resource")
diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GT_CapeRenderer.java
index 852880e4bc..c62a68700f 100644
--- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java
+++ b/src/main/java/gregtech/common/render/GT_CapeRenderer.java
@@ -58,13 +58,13 @@ public class GT_CapeRenderer
if (aPlayer.getDisplayName().equalsIgnoreCase("GregoriusT")) {
tResource = this.mCapes[3];
}
- if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase()+":capeDonor")) {
+ if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":capedonor")) {
tResource = this.mCapes[4];
}
- if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase()+":capeDev")) {
+ if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":capedev")) {
tResource = this.mCapes[5];
}
- if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase()+":capeTec")) {
+ if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":capetec")) {
tResource = this.mCapes[6];
}
if ((tResource != null) && (!aPlayer.getHideCape())) {