From 2a7d67677345466995dba54c47839917ac12634e Mon Sep 17 00:00:00 2001 From: kitsushadow Date: Fri, 3 Jul 2015 07:16:40 -0400 Subject: [PATCH] Need More logic for the forge, double check item renderers, double check lang file, clean out old IR files, start on the forge hammer and inlay hammer --- .../item/TongsDamageTable$1.class | Bin 981 -> 1182 bytes .../item/TongsDamageTable$2.class | Bin 981 -> 1182 bytes .../medievalcraft/item/TongsDamageTable.class | Bin 832 -> 832 bytes .../item/craftingtools/SlottedTongs.class | Bin 3978 -> 4378 bytes .../itemrenderer/tongs/IRSlottedTongs.class | Bin 6728 -> 7505 bytes .../medievalcraft/item/TongsDamageTable.java | 25 +++--- .../item/craftingtools/SlottedTongs.java | 45 +++++++---- .../itemrenderer/tongs/IRSlottedTongs.java | 73 ++++++++++++------ 8 files changed, 89 insertions(+), 54 deletions(-) diff --git a/bin/com/kitsu/medievalcraft/item/TongsDamageTable$1.class b/bin/com/kitsu/medievalcraft/item/TongsDamageTable$1.class index 3c17ee2bab442b51a0fae8afd8394dbaca740942..3d2b68af81382554b2554c85b35948520edca320 100644 GIT binary patch delta 338 zcmcc0K97^@)W2Q(7#J9g7#ufpU1qH3WZ-5{=V8!b;Adpu%1JE9EcVPx&o2Q9Yw<8> zgM@jDQd5dc^7B&RGP*nrdLS8&l*HV`;^fj|ka7ba21Ae_cTs9uW?pKFXHkA0NZgo* z!2~4EnF$mK$Vn_oWn|#@0jlsT%}tv8g7FEX{p7Pu5u7&|m>C#>E^C^s$L!#zwTVGZ zfNckZz%~Z4a3DuhfE~fn5#T^@^aVH(93ufPC}$(kC?*C|uvd8|S2Ifo3p4mKh%iJk zh%%%zh%uBfh%+<-Ei?nF;DK1oV9sCxqV@U1ppd$n>7kV6r1~1ZOh?GXo<~#&Pl@W(VGlKo%2& z8jzG@V4rNjB5lvepbq5mK-4g3FlYjKEDTy;b=nL%U|N?!4=kz=Bn^R>3#b}oCJ+Ds D5kL@z diff --git a/bin/com/kitsu/medievalcraft/item/TongsDamageTable$2.class b/bin/com/kitsu/medievalcraft/item/TongsDamageTable$2.class index f1bd09ed92ef2c9654db62230a89e42103b2e7bf..8c3be61afa3b8b140ed5e8d6aefe61eb189b3903 100644 GIT binary patch delta 361 zcmX|+%SyvQ6o&svi*3dc<3cyyZ&jmKt@lecE(zKd;k|dg?MHH4$K+8Z_W(=`7At`{O$MU6+i{YUH-v3CI&DkFpoh7-gIyMxE3_R zL}^=KQR%)&dT|m4^8aR8psa3+p4)Qc>vpW#R|VFT?2Y7&A4snjg@N+x0vpPkK8f?D zn@EQK6Y4l?x31D3_RWscccX58AqPgu?$dJ4>DX4!Gx#G)PZ+wet%8Py42l|-GB7o) zWWY646m;n;1DkqOL3J2;jKabgMleqEPEe{zIGDmIrg4cGG%$+J~i_SsrX- bhbWI-ss{G3ug?QiwLPTj(B{;w^3(bQbVWgZ delta 147 zcmbQod6k{()W2Q(7#J9g7>qV@U1ppd$n>7kV6r1~1ZOh?GXo<~#&Pl@W{32RKo%2& z8jzG@Ud3^CD=MHy=~kj*jRnLK#ey1*x+W_U5u>aRzPK;?LSh}; zVgq}@1~_)b-t|B55Ae}f6XTh?8?n5Y%+CGhoNvE#&UbE0Uh5F+-H-c^fiZl#Wt9gq z{OnVVJ&@hs>0{d!oQfLBDuR%97eAR2ij{RUuT?dbg^W;oD8r@JWtq#W1ns3Rkp!(JE*la! znqXwD)0|EkUA86I>6n?tYiggeH$h&Kp$YqYI8+%72aVetDe<`^e#;5_rNVv?1{Q!$>1LpH{DTFSn&S{{@^4^N%8J_TzR>xpu_ zp5>RkrXG5xCsI5YfAobFp5e_%|Ke_@JfME1ci!QJ;quypH?@Md6ichEpdTxp{H&1g h4R4(ZSp}ol=vw)nD}U5_mvm2J?**kvl@FTn@h1^#^~wMM delta 898 zcmYk4$xjqP6oX<(+O(IEz9+!13~1h=S21dUM;w}>djCDG9!8bG3s35J-t7!Mvm zXj}#rcSS@+mc|uvC*C~Z!SJ7usIO}Xdg=P=?eACJzTo0K^ZW1DL%?!IUYL14(_|aX z7MEzT8-42xTT##wOtTyP{?)9TvAZr?3v!)*q?aU0)ulKUHNC<&MQ&Y81ZXCn6Q$ z+B0HQ+_!kZ!@f~}iLxsK7tHq-eufpZGi{|p_Mbqay5E;*WvJ*(3}#?5n;>%tF_(1a zv4;7q7uv)EwvfRt7E&zhT2dRzDPgmmic;|^0)jtDB3W!>x&3Ty=SOa;k(!X2=uqac z$6jD0x{M`M)h0AuPQ9n(v#!>JfW_F!^$v}u^uf4A7S2b-4Pk*axo1 z*cq=>I%$q4OkT?htWcnzwit`Db9%WMvK-D26Lq-laBm_^T6z;4E>^k&R~p?iyI1yw z;wUL{WXeKW%p_Z6$dTJ(3d!XFdDO9l(=4Tdl{B-84p!4eKD{E_7YZ1qh+k~bf;BP4 z6=gy&mmblnMI7U?WO=mr3Ek4%^*-epQA6W%!30e`LW!DQ2qkIir4OH`ej&f60U=Yy z3*ay)Uw5!Lb;$}ZIVtb=N+NxD#%UOrWfZS@6MsQjMCoxn_WEGT!4f_G^tfemd=GE+ z_=fC`qPqNs?d!2?9CH=eEceYW=SzUlFwdAlJ?lT>SMv%h`cH}mG3@0f4q`_JZ) zzu&P9zyy)wf+kSf6m9b^3MJwl-Zr~AWG@ben_|J1gg0hKn(de!^M(?3TUR3yjkLzS zzPkEwG?B2I1G4FYA&|Q;xH#wy2P3WCn)wUuri2R_0tZFxgtsjevDKU{(O9ePZ3>6% zNW$y$ao)P55&?HrO?idCF;G)Iqh8=Zf104TBM}OF>+E>6Bi3a5qfNm?C>kjea0M!k z3Cymm5E#@=zOk%scA2l#&+gphfNos_x{vf#&!`Cq^h*s(woNrgz)H;|-**|A8ssmj z_0ibOx{C688cubY#nP)^i@}s`|4_{1+pb+to4@!ILd5`Hrru=ap_*B zg+~qX`l{r}vW|En+9usqy@{qSE+mkl`pT$6F`-CnG$Bx)Uq9CuD4W?BC}AA(8O{9k zWyp7yAwO*y@^`OEU|G8@pw08qsi_cp=mmvy1dK9T<-!Pok>6sOGLbJ(pi(R? z!=@;E<6f0R6>aT_W#gjr7iQxCjIwYL3h3I@q}ss+{@v+SpNP@PqQW^@5EyO2h0IKh z?NdcP)7Dmc#|Jzb zG?9`{MZ3~MeTJTB*l+on)j((ir0pN2|E?<6D$lyra*r`kKXEzw)u7}5M=fWc;w+3o)e6P zWLtG+L&to%T}ik-*`-FH>KWS~v|qW(|qPnnRHw3lWcXp7Vw@Szy0(Q&s)%=7@}?stuFV$EB@W zU)mYJekvwa!S-ZU4vsH~c7&T}$CDwQX@}eGn7}1_1ohkNNVjcIAJX4`t6A-sV-y!8 z3+LkJF8oYj%6E@{Y90&c;e3Idit2zb(9l>~Q(8(`Au#p(*d{Hzz``%(%>9!y*VP0{ z0=}AR`R-R1E|l*wOZ_!vvl=JzAkSEkjCHny@nptwQ~f}JpVzI9J1~)TJR2*p(uK&6$5^LyEYq*{# zo83Z}3Mwlr3+EW64>?1AZDAdL!;`5sTo+C7nB*9j9HR!k3}h4^!P$}%Zm@72uJ1Ow zS&lB}AE%t=e{82Qyjy7~l06zp-FrT}->n4&Cd z*k)ln?xD1^>=lt#PRkP|J^fO$&LCa}686$WN6hvH99k8O(C}DMHtxm!F5D+@Xpc7k z8+i-A#RG)Q^Fxv5P{1huWa30)`@1b%=oR>#h2P6L+)T}Adnz-}XO0wK z+R|c7lTxL_DRsBZo9(Ad`463>eAU8hcwOafMZ~GiMuCqhR$Rzr)qOq!^R=zYWVak_TzUn#DR8!aB z5-x#ZyDtpY(fW?21(hK?+*}chMPn}P%iB`Dx=U7uWMBrSUuefkS#AwqBx1+P!ohf4 z#v@1OL!G*?Iwjw;yCZd~^YX$?%&$r4mM5ig1%-+qqxgdr?^XPG#ZOfHVTzxm_#+fwr1&EhKV9)9iZ4@q zh2m!@-lzCkimy_9jpC11e7)jlD}Jux8x%iJ@yFjxV>LALIfd5}@GEZ_dlB&G6SN<~ z1(-?{Jd-X5*n1)oVVGEODV;xy?k}h7m(%$Z)hsf21i;BqEaSX_{gX!Dj^OCcDC|Vj ztq74Duee3zj!;}1xe~=i$@vs_(r&}{V+Md`8O)0ujG!4K`OL>y9Eii&FO^%4D#Vds zOP~XblV<#iX2>;}(1|5uZ^Oysu499L1^i0$41P!PJDlGU{N@`QosYheEnS6X7*`n> zO_{NLdik7yaX5_OnWVH2cQhomQx{IhPt@!aa0bq#1!qy-1+zf#k1u|Tv-up(&h30D zO`z9H#&k1JR^}ef(>Kb`!JBc;dJH7_#d=sI%h$uyX?ZuRM{&mh(`a=utuCY0m9*MN zyN}|c&SH-bGf<^G80{F*<$+JxEe-G~Uo^#Cg!AdC^d*z{fUXP?^z&j|;y9Car0fUG zhti!fw^JhNj1eV2oXx8kT+xY3J*y`hL)E7fmwVQ_-Bu^A@~pSqZqh-xIwz-pC$9Bu zbbD^-#Eo3Rn^$44PTal)cW=hQw_(TVEeLJJgREP(;W1+kMoMa~!QPT)tieD@U2EW$ zG;=L#_YhvBgry}~s zq?F;Ec;*`8fPYzl7m^F`qTBP*e<$8EQw}5-tCx7c{JrD6Jf*1bIR6jhtLA;RROhQaVhx#YsoPfgJW3(=V3CAV`Vv>;NS!t z%{tk@N^&BC1PJq4e{EcW7Hr_pS(_2!J#8VjVi7MmVLXC1JdFrmMHKI$9q+U1e8RfD z3mpWZi$xBWh+$YNM)J3sQ8-zQCO)0WA8Lwlswl&0;uu~n+Hkr!13wWfaE4e*;JOZH zi>q<2*uabVM*Ko-!UbY0ekpcfxp){CiYIZAco`Rqcd$b1hs(4)tkgzem3AOjYlXO6 zn}92{DY#Or#2T#zYqdJ8)8^qfS~J#bZMa%njBB(raIJP8HfR^%I_*MSudT*LZ5?jV zxN)_exJi2xo3t-*vkq+5b=<0F;C4L=cj^}I(ml9aAA)WA{@AV`gnM)^cIcCEuRaa; z=||yyy&ezgr{H1z96X{g$D{g1cuZe`o%&ilu3w8M^euQ&zZ*~K_uzN>!}z`aG@jL8 z!gKoDcwYYyFX&(4MST}uB9eI7$igee0K969!fQqmUN>s-hGFAPBZ9Y#lkl#Qz_@=kTfVIzBVr!so_&_`>)QUm9QHE7QQ& zW zyj2V_w~3+V4v}ZxFNT>93I{y?nmB_fIfh;Z($+o+)XAvQPL7ZsRTmxe+8(*_wrW$`^BO}=mU?Vft(AjV~ zjfPwB(I(!la(SoPM`RGjk3u2oXiUW6q?5R-%Sg+K4Qojq44k3NanQCzgAxT6z&+C? tGXKFJ=y_Yrl#dL|>fyovkxDG8iEQB}^>95;;i_51dHg-i6#a_x{s|-EO9lV{ literal 6728 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 diff --git a/src/main/java/com/kitsu/medievalcraft/item/TongsDamageTable.java b/src/main/java/com/kitsu/medievalcraft/item/TongsDamageTable.java index 259949c4..520d5466 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/TongsDamageTable.java +++ b/src/main/java/com/kitsu/medievalcraft/item/TongsDamageTable.java @@ -16,15 +16,12 @@ public static final Hashtable blockToStore = new Hashtable blockToGet = new Hashtable (){{ @@ -34,11 +31,11 @@ public static final Hashtable blockToGet = new Hashtable