diff --git a/capes.txt b/capes.txt index dae877ab..baa8ae23 100644 --- a/capes.txt +++ b/capes.txt @@ -1,13 +1,24 @@ mDiyo:https://dl.dropboxusercontent.com/u/42769935/mCape.png fuj1n:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png -alexbegt:https://dl.dropboxusercontent.com/u/48633261/cape.png +Fudgy_Fetus:https://dl.dropboxusercontent.com/u/27415688/fudgecape.png Vexatos:https://dl.dropboxusercontent.com/u/57704711/Dokumente/Speziell/Minecraft/Public/TCape.png +pillbox:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_orange.png Hysting:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_blue.png Xythyl:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_blue.png andrejsavikin:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_blue.png -DentedLeftFender:http://www.mccapes.com/GalleryImages6x/0337da3471c1401dd2e8751d83f8a98e.png -pillbox:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_orange.png +alexbegt:https://dl.dropboxusercontent.com/u/48633261/cape.png +DentedLeftFender:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png Pokefenn:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png sondrex76:http://i.imgur.com/z0EUfp1.png Steelflameblade:http://i.imgur.com/pz1O4pe.png -elkillo:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png \ No newline at end of file +elkillo:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png +Habselaar:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png +LordDarkona:http://i.imgur.com/MY4RmgO.png +master801:https://dl.dropboxusercontent.com/u/90842632/Ender-Cape.png +Zerokyuuni:https://dl.dropboxusercontent.com/u/76684489/zerocape.png +Frosty_Chicken:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png +EntityOmega:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png +skedone:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png +type1ninja:https://www.dropbox.com/s/f6ayqlrgh1jhdd6/My%20Cape.png +turbeauke:http://i.imgur.com/XdOIone.png +Nieue:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_green.png diff --git a/capes/default_blue.png b/capes/default_blue.png index 2ded96d8..e6bd3586 100644 Binary files a/capes/default_blue.png and b/capes/default_blue.png differ diff --git a/capes/default_green.png b/capes/default_green.png index cc9cdbc1..4eed8e34 100644 Binary files a/capes/default_green.png and b/capes/default_green.png differ diff --git a/capes/default_orange.png b/capes/default_orange.png index 995f0bdd..31d907e9 100644 Binary files a/capes/default_orange.png and b/capes/default_orange.png differ diff --git a/capes/default_red.png b/capes/default_red.png index 4a98a818..5ea6b969 100644 Binary files a/capes/default_red.png and b/capes/default_red.png differ diff --git a/capes/default_yellow.png b/capes/default_yellow.png index 80ae04e9..cfff627f 100644 Binary files a/capes/default_yellow.png and b/capes/default_yellow.png differ diff --git a/tconstruct/blocks/GlassBlockConnected.java b/tconstruct/blocks/GlassBlockConnected.java index ef570eba..a32b26d5 100644 --- a/tconstruct/blocks/GlassBlockConnected.java +++ b/tconstruct/blocks/GlassBlockConnected.java @@ -1,6 +1,8 @@ package tconstruct.blocks; import tconstruct.library.TConstructRegistry; +import tconstruct.util.PHConstruct; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -70,6 +72,10 @@ public class GlassBlockConnected extends Block public Icon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons) { + if(PHConstruct.connectedTexturesMode == 0){ + return icons[0]; + } + boolean isOpenUp = false, isOpenDown = false, isOpenLeft = false, isOpenRight = false; switch (par5) diff --git a/tconstruct/blocks/GlassBlockConnectedMeta.java b/tconstruct/blocks/GlassBlockConnectedMeta.java index 1abd6b2d..c50e5882 100644 --- a/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/tconstruct/blocks/GlassBlockConnectedMeta.java @@ -2,6 +2,8 @@ package tconstruct.blocks; import java.util.List; +import tconstruct.util.PHConstruct; + import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -17,7 +19,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected { public String[] textures; public Icon[][] icons; - boolean ignoreMetaForConnectedGlass = true; + boolean ignoreMetaForConnectedGlass = PHConstruct.connectedTexturesMode == 2; public GlassBlockConnectedMeta(int par1, String location, boolean hasAlpha, String... textures) { diff --git a/tconstruct/client/event/EventCloakRender.java b/tconstruct/client/event/EventCloakRender.java index 869b4cf4..b2f4c3f4 100644 --- a/tconstruct/client/event/EventCloakRender.java +++ b/tconstruct/client/event/EventCloakRender.java @@ -1,5 +1,6 @@ package tconstruct.client.event; +import java.awt.*; import java.awt.image.BufferedImage; import java.io.*; import java.net.*; @@ -12,10 +13,11 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.event.ForgeSubscribe; public class EventCloakRender { - + private final String serverLocation = "https://raw.github.com/mDiyo/TinkersConstruct/16working/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(); public EventCloakRender(){ @@ -57,6 +59,7 @@ public class EventCloakRender { 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); @@ -85,8 +88,9 @@ public class EventCloakRender { @Override public void run() { try { - BufferedImage bo = new BufferedImage(64, 32, BufferedImage.TYPE_INT_RGB); - bo.getGraphics().drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); + 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.func_110310_o().field_110560_d = bo; } catch (MalformedURLException e) { e.printStackTrace(); @@ -94,4 +98,20 @@ public class EventCloakRender { } } + private class CloakPreload implements Runnable{ + String cloakURL; + + 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(); + } + } + } } diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index 82d644b2..0936e949 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -1768,6 +1768,12 @@ public class TContent implements IFuelHandler //Armor GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(dryingRack, 1, 0), "bbb", 'b', "slabWood")); + //Landmine + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', Block.pressurePlateStone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 1), "mcm", "rpr", 'm', Block.stone, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', Block.pressurePlateStone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 2), "mcm", "rpr", 'm', Block.obsidian, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', Block.pressurePlateStone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 3), "mcm", "rpr", 'm', Item.redstoneRepeater, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', Block.pressurePlateStone)); + //Ultra hardcore recipes String[] surround = { "###", "#m#", "###" }; if (PHConstruct.goldAppleRecipe) diff --git a/tconstruct/util/PHConstruct.java b/tconstruct/util/PHConstruct.java index 5cee4f76..e79c22cf 100644 --- a/tconstruct/util/PHConstruct.java +++ b/tconstruct/util/PHConstruct.java @@ -3,7 +3,7 @@ package tconstruct.util; import java.io.File; import java.io.IOException; -import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.*; public class PHConstruct { @@ -340,6 +340,11 @@ public class PHConstruct //Slime pools islandRarity = config.get("Worldgen", "Slime Island Rarity", 1450).getInt(1450); + //Looks + Property conTexMode = config.get("Looks", "Connected Textures Enabled", true); + conTexMode.comment = "0 = disabled, 1 = enabled, 2 = enabled + ignore stained glass meta"; + connectedTexturesMode = conTexMode.getInt(2); + /* Save the configuration file */ config.save(); @@ -656,4 +661,7 @@ public class PHConstruct public static boolean lavaFortuneInteraction; public static int islandRarity; + + //Looks + public static int connectedTexturesMode; }