From aeccce2839f7526cf8bac9f9698c1cd9510111b4 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 19 Aug 2013 19:05:02 -0700 Subject: [PATCH 01/12] Update capes.txt --- capes.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/capes.txt b/capes.txt index dae877ab..8a075c98 100644 --- a/capes.txt +++ b/capes.txt @@ -1,13 +1,17 @@ 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 +alexbegt:https://dl.dropboxusercontent.com/u/48633261/cape.png DentedLeftFender:http://www.mccapes.com/GalleryImages6x/0337da3471c1401dd2e8751d83f8a98e.png -pillbox:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_orange.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:http://www.mccapes.com/GalleryImages6x/a001fd1a9bd8ae3f5ef8da52a784d323.png +LordDarkona:http://puu.sh/45Zgg.png +master801:https://dl.dropboxusercontent.com/u/90842632/Ender-Cape.png From 24187cf1d8c52e10a5cc97c93d4a0f3c9a6ad8f1 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 19 Aug 2013 19:28:40 -0700 Subject: [PATCH 02/12] Update Capes.txt - puu.sh is not permanent --- capes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capes.txt b/capes.txt index 8a075c98..08cedc28 100644 --- a/capes.txt +++ b/capes.txt @@ -13,5 +13,5 @@ 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 Habselaar:http://www.mccapes.com/GalleryImages6x/a001fd1a9bd8ae3f5ef8da52a784d323.png -LordDarkona:http://puu.sh/45Zgg.png +LordDarkona:http://i.imgur.com/MY4RmgO.png master801:https://dl.dropboxusercontent.com/u/90842632/Ender-Cape.png From d22b39335fb12012e509112ac3c954ddf2a2c0d3 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 19 Aug 2013 19:56:54 -0700 Subject: [PATCH 03/12] Update capes.txt --- capes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/capes.txt b/capes.txt index 08cedc28..73e9f8b6 100644 --- a/capes.txt +++ b/capes.txt @@ -15,3 +15,4 @@ elkillo:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_g Habselaar:http://www.mccapes.com/GalleryImages6x/a001fd1a9bd8ae3f5ef8da52a784d323.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 From 200405dd9ae071658c0f3496eeb04cf3ceaca7ba Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Tue, 20 Aug 2013 20:38:55 -0700 Subject: [PATCH 04/12] Transparency in capes --- tconstruct/client/event/EventCloakRender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tconstruct/client/event/EventCloakRender.java b/tconstruct/client/event/EventCloakRender.java index 869b4cf4..34f15723 100644 --- a/tconstruct/client/event/EventCloakRender.java +++ b/tconstruct/client/event/EventCloakRender.java @@ -85,7 +85,7 @@ public class EventCloakRender { @Override public void run() { try { - BufferedImage bo = new BufferedImage(64, 32, BufferedImage.TYPE_INT_RGB); + BufferedImage bo = new BufferedImage(64, 32, BufferedImage.TYPE_INT_ARGB); bo.getGraphics().drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); abstractClientPlayer.func_110310_o().field_110560_d = bo; } catch (MalformedURLException e) { From d9c9cca2988e6d5262d5c37e62d8acbbc98cf130 Mon Sep 17 00:00:00 2001 From: fuj1n Date: Tue, 20 Aug 2013 03:43:04 -0700 Subject: [PATCH 05/12] Update capes.txt --- capes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/capes.txt b/capes.txt index 73e9f8b6..664a7830 100644 --- a/capes.txt +++ b/capes.txt @@ -16,3 +16,4 @@ Habselaar:http://www.mccapes.com/GalleryImages6x/a001fd1a9bd8ae3f5ef8da52a784d32 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 From 11116b1455e7fcb7bb5f2f78ae8508cb12a41452 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Tue, 20 Aug 2013 21:35:50 -0700 Subject: [PATCH 06/12] Added a config option for connected textures --- tconstruct/blocks/GlassBlockConnected.java | 6 ++++++ tconstruct/blocks/GlassBlockConnectedMeta.java | 4 +++- tconstruct/util/PHConstruct.java | 10 +++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) 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/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; } From a57ca60abff737d624d1215f1d66846274810e81 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Wed, 21 Aug 2013 00:00:31 -0700 Subject: [PATCH 07/12] Added HD capes --- tconstruct/client/event/EventCloakRender.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tconstruct/client/event/EventCloakRender.java b/tconstruct/client/event/EventCloakRender.java index 34f15723..27b828aa 100644 --- a/tconstruct/client/event/EventCloakRender.java +++ b/tconstruct/client/event/EventCloakRender.java @@ -1,5 +1,6 @@ package tconstruct.client.event; +import java.awt.Image; import java.awt.image.BufferedImage; import java.io.*; import java.net.*; @@ -85,8 +86,9 @@ public class EventCloakRender { @Override public void run() { try { - BufferedImage bo = new BufferedImage(64, 32, BufferedImage.TYPE_INT_ARGB); - 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(); From 1ded6a99e26e646f7c2d1f6342d8b0808ca866d4 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Wed, 21 Aug 2013 00:06:51 -0700 Subject: [PATCH 08/12] Fixed the resolution of default capes --- capes/default_blue.png | Bin 1382 -> 786 bytes capes/default_green.png | Bin 1342 -> 757 bytes capes/default_orange.png | Bin 1313 -> 721 bytes capes/default_red.png | Bin 1339 -> 753 bytes capes/default_yellow.png | Bin 1400 -> 813 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/capes/default_blue.png b/capes/default_blue.png index 2ded96d8e7817ddec5e35f46017942b65dea406b..e6bd3586392641f64e11fc24699c4241d2e958b4 100644 GIT binary patch literal 786 zcmV+t1MU2YP)VGd000McNliru-3S#21Ui!JLk<7{0-s4l zK~!ko?U&tZ6G0Tme>1a*?dD^%B~3$3Q==D!!g0r>d-A+`ENie8nQx9-G~N-5sG@36VqV*S$- z!f=mC!vQFIHD0}ZfKrCl70Bo3VuS78XOz~IXO{?u{fQGm19+u6g~B`{5db?oUjfJ$ zs#L1WOi%j=g0<0PW`KxAuq-TIVyp83fJ$|lOlBH@;cy#&roo`U0o~u7SQ}FGYV>+- z6e@WcaDbbeMI<7hpCg;iAtHzf{r(2VWD$|^PPBtDSsZgDnMVNN%(>gN)>ct!zr=~y z*yzU1yO6NR{*wUR&PVDC9<}-f0E(rfakQ^oK8^2B0rE#jRwCT|Y;rT;+4I*ln~NjE zzF(!??(t~l4SLMuM=6b)D<}UF90ogV_r9>+nu$xG?^pLLLO-Cp^$D#tVKDeD>Y0q2 z{3Ecp+a(MJgu(7uqd|Xz;oeSM2DNc8&XLKv0}e`=>*hu#8^=ljWU@J|4dZd6vvKNM zi6%pU(o6#@Lb0?!(W}Ip9}GhBg(}))4s}xSj>i9y4U#E#>V-zw``=KLQK2;-N-vu7ZsMCJ~JYo?mBb z%E4$w7+SQ*`0r;EB@@^z>%07*qoM6N<$g5D8va{vGU literal 1382 zcmV-s1)2JZP)VGd000McNliru-3Sv9I5VWdXnX(w1oKHm zK~z}7?Ur3{6Gs$=pZ&1c-u1^ib{v}|4yKU`qN!+vT7*QEUbRSt!e8h`Z~I%?`~HUZ zrUI!KMQW>3iYOFSr2z%vkl6S$#&*2x{g_@jS#U`Ljs&GrkF@gf%;?O#bKZH+k%SPO zJ^zKMlyA{}Tt<>*cFgx(BuPOxGRzd-<;E{x(Q2+B$qM_KEGhJQHHlYX()^oe#j&?8 z5{pmJ-YoNQ^=dF#D4xOh9a5=7v|1aK?*BxyaSz*i{M^6-L8G?((m|*Ir3XJUQ#eH; zndAJ0PoJQZBv6kbo`0*OW(>J-XvVw0}c%2RaUZ=yYMuS6h-?Dgajce=c zxPX5U006(;TxNcLZe%!>%26(N`1$Hxv?3u;e%1g_g!?|7?~^{HitJ8Ht>D-i9E{TfI7a| zyEa_01fIXUgy}|>&F1RZ3bE4dQiw#5JP#RI%4E1wufw)4JP+Tp5JIrpYLVA8 z?sU6jWn>wt8S^8Gyf{P1Cl(I_*K2wm4DuW2Jqm%q*3o!^?{ z5LXl)S{8rydSi8?>dWZSTaJUe-HlFb8tb-AHXNot7?9b1)H{BCFd!WYQMPTCx3;K{ oDWfkX1FzC#{^RyPfPdTm23s#ZBH^pyod5s;07*qoM6N<$f^3(HdH?_b diff --git a/capes/default_green.png b/capes/default_green.png index cc9cdbc1a7f8d45756caeda48940d4e0d708164d..4eed8e34308bdddd25d4cb71ea7cfd358abe8341 100644 GIT binary patch literal 757 zcmVVGd000McNliru-3S#21r;DBPZj_G0)k0I zK~!ko?U%c56HyR`zd2`bj$<%Zu8vs9UU}KP;!Z6 z8AT!F?%2fZJ!dGKu!*pfHn#SYR$J_zqn&^MnKL5*%dd^Lzj)dk5Q*gk=M-<1U;<_z zL^R%{9M%;voQql^`>nzd5KKHXT24IrJfi$F$krB&}>??NRIj#_%b zwn|hLZGXG`A_M?iA1qfMId&I?<;S@LFqXCTjOtp()+aDW;2A9ffcQFWzIB8q;5!|{ z>0AU^hn-L;-?lW{j#0w^jL!?DnE>Y;9!NJqRSBmR?t5G3*@DAzzNZ0h&m;jf^rfdDu@cLeZ__j zVPOr00000NkvXXu0mjfulPY) literal 1342 zcmV-E1;P4>P)VGd000McNliru-3SvA01b2fqZgMDh*VHj6{sqxR6+_Dh+c3Kw>$*A2@+4h8*qV8 zL0nJ?2~Z`f9xi~iL^x?`*WQU^e8@fz7f$S?C21Y0rARDkYmfF}X8r5`=U*d~QY?R_ zss62mejQAqu^(})NHm3Bfbw~hjV}VaRfUio8%h&|jYRMaLKH4bb?W_uZplR6i|~FP zWoN$`BSMW}K|`zhw10%;j=<}w$4?v!daF+#gbv{Tq%rw=Olv{#;u|9dkQ!_EBXVmI z?k^xcNO-fFW0m>Gc(_hH)*q+inL^kaA)0Zhybf|`zBi$Q~+0mih# zEP-E8#19k^0ySp&zq@dON!!LO6bM`wXK9I`(ZDQ~2(Io9er|=?M8!}oet}s z$LH1R6R#lwL?Tg2k+}$FNn*?>j8_!)ydb+MNjZXS#l)C6VwMPu5|04Xgg~F1B;MV{ zu2cvb4XkpRpkBu;6bQGrNS`?az|7gRET>ZB4P&e#9r6=%+Caq$vj}NhM<{_%f?ivp z88I^c=RGMT7!ow|@bgS2L%Z2T&*ccWwy?@&{90|uh*>P+t*?WW_?w#uAy`hOP6iuYNyo=4p2 z40=qb!_BQNPAz=R`S&)swz)~f_%1ihDs{EX#zlR!vw_wkWUCf0eA~l0(BKaK>`WaE z?8B7~R;EWf-{zf_Rc^Q2gzYwdyUmSelgn@2A)RkyP4xI+rNaZyBOa3l9U$o^h`OZk zhd>oa$ph>JU8bsnEiEDN6)>u@iUqu955GQHhkBd(h7g=%~=4_j8 z6j8RUL%b$?Jn!F|VMs>PxaWEN+Ut#V8r7f18NC&T=zFKpS<7P6_bHktZV*t|+tmAG zHwefZ1~uPjwcp1b(?*{P1J5!f|MB=Az`q@T1E`rJNfFip>i_@%07*qoM6N<$f?Z=> AqyPW_ diff --git a/capes/default_orange.png b/capes/default_orange.png index 995f0bdd1ba354120a6c40dc1a40962dce355f18..31d907e943038c0ff6c0dfdd4741816190c776ae 100644 GIT binary patch literal 721 zcmV;?0xtcDP)VGd000McNliru-3S#21uy0*mZSgx0$xc( zK~!ko?UqeX6Hyd~pL^${(}FGipg^N0B(@MBDaI8`Ho9C%#2mTb-#+6&PMia$E zjUUn@P@{+~mCXobz4*u)j&Ta{@gHBcB)vh5=<8 zT88B9o}wc`Dz3$^!K-ZqDL}klC46i_xecA4@Ua(fZq(sIz``PQcHq+h_7318fAhhf zf|t9uUj!52gMjs2m|ugZ$JGgWBviW`et~Zz@cLv96JXAUtsacFAU8awRE~e>ya#y) zn$GyGj?}8jh zf{Ak9e7J}y$s`is$cLcSVyzSf>&2+_0Ty1g$vr9(1UGoU4aHoFE8y?DAJm^U#wH$p z8f!2(9&+~PGvP&&*~4@eD!?1UQ6Jo|U8+``Jit_N!2SvRE=IR}DSs0RDR%}F;Ew^0 z3xk8?Y|dS_eC7V-F|S%p0P+TeMjW?nm~rFYmqrEzsOAJJ5Y!!L ztb*TKjuQOkQJ)5LboC(>YhoA{QYygRX9JP)VGd000McNliru-3SvCG9cL2e{lc+1g=R$ zK~z}7?Uze$8&wp?e{*L%<462RX6nXi8X74HEoqffx}aU9EGQBnD%N}lc6&|6i=V6qjb)=ReaipucbMDNU^FQy=lu}gQ z($w-MxB|k6eG;JSFl@q%F8JzEOjUr0IhG;^K3z~6FMzbqXHjn_V0aFyW%$9}KfG21 zPlM7VRF~mF2Od?xOFdn15W^?GKYtJg!1o$lUV+hz@NV5c08fBjq@qjaM#X>arvC+@hH4P(|L+&_CzTVuT<-o1=ngid{j)|U$?@33MIL&pfeHQ&O@w#nE{Zq6^U*lZFuoA}Kp4{9~u zxv@;fZek6!`Cz`qhUXy%^nw5gc3`6o{?9e+#J=(X8Cl`UCNy$gEBEPdaAacdl{qUS z^1Iosq(sv+48vg8rIBx7Sl#4G2ywCyYU<$m(5W1*&9)Do2XXIMXgqUHM81J>Oy@RI z>;c@ClA>vzEQB;2Mke~pOgu9UKuQOt@ADHT6#V_z7y9ACZ+}-{>$d{#Vu9OtCb*Q( z@10%B=ed1n0(Y_d%olgFT(@niK`?kD1F$WPSVA$W7@LJ?<~#yP^f;h61l8@Mg^V01 z-BB8hPIrH~SmdYs7IrGdr99}F46@zs1F`n&DQe9oZvAM}aGI=r&jGtHV+7zQ7 zPWK~BhDW}fJftr;2g=B5qru35kl0oJpXJg{rC8tE;%q8K+4BYmaLNRH4Uvcty+S7F zCRsc=jp`iIebZ3L94~x4okl6Ox4x~__LSe<@2=58fz_QI#!u>jXzo>r4{x=jmm!J= zZ)7Xm+eoF5Qlg|}-f_6=y4-bL<{bwmC9&tBq-3?xpk!IBbUK6OKpewq10seHQi2IW zL98VZsuw;Qj3uEgz}LG!G~$THCL}l(R3)T^AXEyW6q=@?!f$9Ea&00000NkvXXu0mjfvkhdA diff --git a/capes/default_red.png b/capes/default_red.png index 4a98a818f76bae03a17ac64936c82896b99ea66b..5ea6b969226b292ccd875f1facd43deafa4a03da 100644 GIT binary patch literal 753 zcmVVGd000McNliru-3S#21_)>ka0~zd0)9zE zK~!ko?U&7J6Hye$fA>yiCNs@IT8OksYB3=tp_^{<0=0sVpc@~+m2cr=_y%s>2*s7q ztqTi9Y13AW3)47F^D&tm7d2y2lhkD=%nt?z&f&s2_kTXF0(e`i$w%L((d%I-#h5?@ zLn+oRi^th4uNw_Mce_(Qvq%BogJ7}KJt6fhmlMx0cwQ)QadpM}Rx2_-U0Y))LecX$ z_kDIV8B$tvIUL@3aLzR4)AjYePeKadU8}{u2nE;WWxf8_sx{X~N1V6Y99&+~8;w{t zQUIlNnm5hnjkHfrC|XwJaMtf*D8+6jgCB-VmjDe=b{w{Bn@|LRZ-W55e^T?Sd zA`;n`P5~mq2zau(%5k>~K;84mXbnI+45_*<%^;Y0NFYKfou<+2p_GcB0>n0* z%>qzzoanZz`}>%=9C!8qP=x$M^NgJWz8)U(aC;koaTOOlkN)W?X9owEGiqA{>oE-a zpC;&sAs78V4<<%n!Silz*7y1HXZ!2i8iS!o)F@+J0zZdCI$=n6&YW)s0l$XBXbhS$ zZFmbyAP`~2ai)xJwF-b|7z7hd(N>BL(~MNG6bY!hE+RtNamc%F6nxm}uxZ;^3vT?8 zZAbrun61lERQXJXm0FF;9CWvTd|w-2|ITO*yRW?2wwX-4$a# z0j3n-l*@CSHY_W4(*ExRhzJ$OLAx%>FpwaC(P&BuT5GDVOJ5{VGd000McNliru-3SvA4;-G=pC$kR1jtE5 zK~z}7?Uze$TU8LpfA`^ge6M5YwocMGuQsnLX;i7IT7~l0{X8tq(87ops z?p(Sgf2dZ;IS!hl&=y}xG(}<5FnHUx`68F&aih_5=P=QMZO=RY(qAOXN5jMNlXK@t zClYMcYJ6KNbq;TzJxd@Z6Uihms#R9@_V{UkpK=hKs8~wL!+QO-JD~%tluF!^l5xx8 z)9cs&I8{~lpFH73rNU~tjMHrLZxbD0CLZUjmoHnXv9ZB~VRSBRx-OccaAjbCY8d`I z9hfyuHXMg+WbCh=$CzO-DFma2!KUjXr6iQHFXi7{yGAM=#~2#ID;6=Qr}6T6jL}iN zogHH7G)^vuo=UNo&+{Ov!!NVhSAIin=W7#q=gb)r(M`SX1J3AOdL-@P9Bo-F|IJdOKoMn-Y#rg`8 z+WlqBFbJh&!Z1i`8cm=Hx?f!iv68HOl|g0AZj z=?YvOU9=iwOjS>pLVH0#Jq&3a!SgSDpWlL@6P?&01$&ePu8wXVkPHszmfijQno?oM%eaIkZBd2o=GyHgY& zweH-xm*hq|P2ThRPa%K>%R)-YtZ6c4SsmlUdYwrj*mT_^l}roK*?Y|BF!jw+n)vBC#h+?a2y`j>wQh5`s8qPl7Ci=Ib1 x7Gv9WdA7e#u}>O(EeQObqVgY?{~h?J<#+99Fl{V}7l;4=002ovPDHLkV1jtUZQB3< diff --git a/capes/default_yellow.png b/capes/default_yellow.png index 80ae04e9befb98c1546f7ec944a8c979e99e3d40..cfff627f0a6b6e20989ac6a756ad9a871ca6d2bf 100644 GIT binary patch literal 813 zcmV+|1JeA7P)VGd000McNliru-3S#21{#~R0Ym@*0=h{= zK~!ko?Uzk!8&?#DpL=IK8qG*@gJoGGf5=J`)oo+ihNPQd2Sc(B2_euQPzoVGCW|b) z>Y~v95D5LGV7e`)Cbe-bV=R%>mSjtsnR~O4J+6r4ZmnS+7#QZ9xp2>Y&pG!9fbYKj zQm_B~u*mA3d1W8Q0+P z!$oR)O@92j9vSbg74QSiY-y6(-XY7M<}gjc;i3P(3+Ja&`p=D{OCJOi;N`0W?ygKz z@-lq$_3d-35VVdq*{!|hm){z6x{A1A0xXtYzW-t8RN5PqymaJH+v}&r@{LJa?I3mm zkN}mk!~C2>7-|6a_d5X0mePFj*#}HbStz9=d+ZdTG$^H6TP^TwK(;k%|3g2A0Y*CL<0Q1)yB_cO&&zRg{14k(KVeS1FK;0Qg@QfS3NQg$EuX#p4*C2} z)B-&(*S`(=ZML@C7>1yIJlF4 zpBm6VX@%pY2aMTVKP57*iSM7^0xe5Yn6{(bk3|5g*Rp`3Qg$g8-DvY+&}O!j#Gk3_2?9v1;cCUjFl~e|QQ8O8fD)vXRIg>}^%P3==LW4A`kW0> rVHnSVB_t#yBqSsxBqSsxB*cMtz(eb8_H)al00000NkvXXu0mjfaq)2g literal 1400 zcmV-;1&8{HP)VGd000McNliru-3SvA4>CdnlIZ{d1qDe& zK~z}7?Uvh%TU8Xsf9H~Oom@0&CMRh#O&v$87Q9pxMV*484@$)cQSem+5&Ty~eDz5X zeDX&(Rdwu)c zOOaCY-n$RU@4jE=Vr?BwRoJwsAERjs<9Un69?kLAJ2RY{X`^YEeXeJkrf{hd?CkV6 znexKXl6>W*GTE$4ZK2I)Uo?j=pFEN$>Pt$+G_{2mpPsnH*~ zmm~Cj>`H~O(ZDDa2A=cNi%4Nbv1Jm;e>vfD= zj%aBK_uxSQ#_ztHNyj0ZNQ|^e>Xm;A;}$|lik{7wt07~MF*N-iMnbt}fx|NDDu$tA znp?t=OeSeHo9LMg(b5v8=h0hS99G20=LxD+P*r-h8j7MY={UOs@bZgy^3^x~P$J_i z7W>BQPob!z3(7g)M@UJ3brn66p|`k*p2-mUKAP(eDpD%3T(55^mmE2V3NU-VgPT0S zhl-wA%y!cAL{n zOB5$Q;{NC6`LFINvX|;%2EqbjMrFDMlZbDUe zN1>I~h;CO91me0*O}|IG-5<(mBB5ege=S+Rr=#0D0JIqbToZ!4VeF1VQ554iTQen7 z14@m#I#G0)ora;3-(wBAznvZXBE#yh8T>ODjvX&^D4ia@JCsgy?06af%)sZvlSv-Q zW@&`s=oA8&noI&Ql?j(Z!5uDM^gEP_HnoNIZG)8eU6#HuiZM3M%f0zLKYnYHwQUZi zL33S1r?Umb;xBt>wpu*wrMa-YOxdz_R{_r(BbmCBsXGo|)s%^CKQ@eOX>?me_zD6zTttK~9l+tgQA*=O5SgJ5(3`}R7hs)>|+6lLq7Or;NQ+dg}Rop)=m;~=FR zjuXx1aPgb-%~8l?m|I_G?`|vLj#ajGDvVo%;pm;{?AjVaN`w$dA(+nPIO+SG^nIpt zIiwK8L4Xv3xs??>(`2^W9Swk#aG>I%=@yEj6UzvQw^Tw^Ri-ABgkek^5Ber4x$Xcc z6>Wrwaa5H^O8Rk3BqhBlV$yM#bR2q7L?k6)JlL4DrZLm$5RG^bD7(47|IFUpzn_Y2 zv)8g%>-X_Yb4$||Z3jpq^bPJ?SBCOw*3LZwmo1=RHnWF0000 Date: Tue, 20 Aug 2013 12:07:51 -0700 Subject: [PATCH 09/12] Update capes.txt --- capes.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/capes.txt b/capes.txt index 664a7830..351d4a15 100644 --- a/capes.txt +++ b/capes.txt @@ -17,3 +17,6 @@ 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:http://www.mccapes.com/GalleryImages6x/8149948db70ad6255f643c490408951f.png +skedone:http://www.mccapes.com/cape/1bec9771cb83f09585c56d0263f95d5c/ +type1ninja:https://www.dropbox.com/s/f6ayqlrgh1jhdd6/My%20Cape.png From ab3eb32219bc4db9ce403056dc8e92bf86be685c Mon Sep 17 00:00:00 2001 From: mDiyo Date: Wed, 21 Aug 2013 00:41:04 -0700 Subject: [PATCH 10/12] Update capes.txt --- capes.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/capes.txt b/capes.txt index 351d4a15..baa8ae23 100644 --- a/capes.txt +++ b/capes.txt @@ -7,16 +7,18 @@ Hysting:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_b Xythyl:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_blue.png andrejsavikin:https://github.com/mDiyo/TinkersConstruct/blob/16working/capes/default_blue.png alexbegt:https://dl.dropboxusercontent.com/u/48633261/cape.png -DentedLeftFender:http://www.mccapes.com/GalleryImages6x/0337da3471c1401dd2e8751d83f8a98e.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 -Habselaar:http://www.mccapes.com/GalleryImages6x/a001fd1a9bd8ae3f5ef8da52a784d323.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:http://www.mccapes.com/GalleryImages6x/8149948db70ad6255f643c490408951f.png -skedone:http://www.mccapes.com/cape/1bec9771cb83f09585c56d0263f95d5c/ +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 From f65b8ce7b91dc8250f07ff16e45eb9db93726354 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Wed, 21 Aug 2013 18:20:44 -0700 Subject: [PATCH 11/12] Capes now pre-load at runtime --- tconstruct/client/event/EventCloakRender.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tconstruct/client/event/EventCloakRender.java b/tconstruct/client/event/EventCloakRender.java index 27b828aa..b2f4c3f4 100644 --- a/tconstruct/client/event/EventCloakRender.java +++ b/tconstruct/client/event/EventCloakRender.java @@ -1,6 +1,6 @@ package tconstruct.client.event; -import java.awt.Image; +import java.awt.*; import java.awt.image.BufferedImage; import java.io.*; import java.net.*; @@ -13,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(){ @@ -58,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); @@ -96,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(); + } + } + } } From b3eced2ebbca3cc1d1cd5fbc57561c066326a117 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Wed, 21 Aug 2013 21:44:46 -0700 Subject: [PATCH 12/12] Crafting recipes for landmines At least temporary, may be permanant --- tconstruct/common/TContent.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index 3a2e1499..1e54d055 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -1771,6 +1771,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)