From ec74ded4f1752f5ad9fa5be5a7f32b591e424bb3 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Tue, 8 Oct 2013 22:25:50 +1100 Subject: [PATCH] Added comment support for capes.txt parser Fixes a syntax error on line 51 in the console. --- .../client/event/EventCloakRender.java | 231 ++++++++---------- 1 file changed, 100 insertions(+), 131 deletions(-) diff --git a/src/tconstruct/client/event/EventCloakRender.java b/src/tconstruct/client/event/EventCloakRender.java index cb225240..6cb38d1e 100644 --- a/src/tconstruct/client/event/EventCloakRender.java +++ b/src/tconstruct/client/event/EventCloakRender.java @@ -1,164 +1,133 @@ package tconstruct.client.event; +import cpw.mods.fml.common.Loader; import java.awt.*; import java.awt.image.BufferedImage; import java.io.*; import java.net.*; import java.util.*; - import javax.swing.ImageIcon; - -import cpw.mods.fml.common.Loader; - import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.event.ForgeSubscribe; -public class EventCloakRender -{ +public class EventCloakRender { - private final String serverLocation = "https://raw.github.com/mDiyo/TinkersConstruct/master/capes.txt"; - private final int timeout = 1000; + private final String serverLocation = "https://raw.github.com/mDiyo/TinkersConstruct/master/capes.txt"; + private final int timeout = 1000; - private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics(); - private HashMap cloaks = new HashMap(); - private ArrayList capePlayers = new ArrayList(); + private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics(); + private HashMap cloaks = new HashMap(); + private ArrayList capePlayers = new ArrayList(); - public static EventCloakRender instance; + public static EventCloakRender instance; - public EventCloakRender() - { - buildCloakURLDatabase(); - instance = this; - } + public EventCloakRender() { + buildCloakURLDatabase(); + instance = this; + } - @ForgeSubscribe - public void onPreRenderSpecials (RenderPlayerEvent.Specials.Pre event) - { - if (Loader.isModLoaded("shadersmod")) - { - return; - } - if (event.entityPlayer instanceof AbstractClientPlayer) - { - AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) event.entityPlayer; + @ForgeSubscribe + public void onPreRenderSpecials(RenderPlayerEvent.Specials.Pre event) { + if (Loader.isModLoaded("shadersmod")) { + return; + } + if (event.entityPlayer instanceof AbstractClientPlayer) { + AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) event.entityPlayer; - if (!capePlayers.contains(abstractClientPlayer)) - { - String cloakURL = cloaks.get(event.entityPlayer.username); + if (!capePlayers.contains(abstractClientPlayer)) { + String cloakURL = cloaks.get(event.entityPlayer.username); - if (cloakURL == null) - { - return; - } + if (cloakURL == null) { + return; + } - capePlayers.add(abstractClientPlayer); + capePlayers.add(abstractClientPlayer); - abstractClientPlayer.getTextureCape().textureUploaded = false; - new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); - event.renderCape = true; - } - } - } + abstractClientPlayer.getTextureCape().textureUploaded = false; + new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); + event.renderCape = true; + } + } + } - public void buildCloakURLDatabase () - { - URL url; - try - { - url = new URL(serverLocation); - URLConnection con = url.openConnection(); - con.setConnectTimeout(timeout); - con.setReadTimeout(timeout); - InputStream io = con.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(io)); + public void buildCloakURLDatabase() { + URL url; + try { + url = new URL(serverLocation); + URLConnection con = url.openConnection(); + con.setConnectTimeout(timeout); + con.setReadTimeout(timeout); + InputStream io = con.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(io)); - String str; - int linetracker = 1; - while ((str = br.readLine()) != null) - { - if (str.contains(":")) - { - String nick = str.substring(0, str.indexOf(":")); - String link = str.substring(str.indexOf(":") + 1); - new Thread(new CloakPreload(link)).start(); - cloaks.put(nick, link); - } - else - { - System.err.println("[TinkersConstruct] [skins.txt] Syntax error on line " + linetracker + ": " + str); - } - linetracker++; - } + String str; + int linetracker = 1; + while ((str = br.readLine()) != null) { + if (!str.startsWith("--")) { + if (str.contains(":")) { + String nick = str.substring(0, str.indexOf(":")); + String link = str.substring(str.indexOf(":") + 1); + new Thread(new CloakPreload(link)).start(); + cloaks.put(nick, link); + } else { + System.err.println("[TinkersConstruct] [skins.txt] Syntax error on line " + linetracker + ": " + str); + } + } + linetracker++; + } - br.close(); - } - catch (MalformedURLException e) - { - e.printStackTrace(); - } - catch (IOException e) - { - e.printStackTrace(); - } - } + br.close(); + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } - private class CloakThread implements Runnable - { + private class CloakThread implements Runnable { - AbstractClientPlayer abstractClientPlayer; - String cloakURL; + AbstractClientPlayer abstractClientPlayer; + String cloakURL; - public CloakThread(AbstractClientPlayer player, String cloak) - { - abstractClientPlayer = player; - cloakURL = cloak; - } + public CloakThread(AbstractClientPlayer player, String cloak) { + abstractClientPlayer = player; + cloakURL = cloak; + } - @Override - public void run () - { - try - { - Image cape = new ImageIcon(new URL(cloakURL)).getImage(); - BufferedImage bo = new BufferedImage(cape.getWidth(null), cape.getHeight(null), BufferedImage.TYPE_INT_ARGB); - bo.getGraphics().drawImage(cape, 0, 0, null); - abstractClientPlayer.getTextureCape().bufferedImage = bo; - } - catch (MalformedURLException e) - { - e.printStackTrace(); - } - } - } + @Override + public void run() { + try { + Image cape = new ImageIcon(new URL(cloakURL)).getImage(); + BufferedImage bo = new BufferedImage(cape.getWidth(null), cape.getHeight(null), BufferedImage.TYPE_INT_ARGB); + bo.getGraphics().drawImage(cape, 0, 0, null); + abstractClientPlayer.getTextureCape().bufferedImage = bo; + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + } - private class CloakPreload implements Runnable - { - String cloakURL; + private class CloakPreload implements Runnable { + String cloakURL; - public CloakPreload(String link) - { - cloakURL = link; - } + public CloakPreload(String link) { + cloakURL = link; + } - @Override - public void run () - { - try - { - TEST_GRAPHICS.drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); - } - catch (MalformedURLException e) - { - e.printStackTrace(); - } - } - } + @Override + public void run() { + try { + TEST_GRAPHICS.drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + } - public void refreshCapes () - { - cloaks.clear(); - capePlayers.clear(); - buildCloakURLDatabase(); - } + public void refreshCapes() { + cloaks.clear(); + capePlayers.clear(); + buildCloakURLDatabase(); + } }