From 42d271c0188a661e1299241977df911b2e4c2e3b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 4 Jun 2016 09:56:48 +0100 Subject: [PATCH 1/5] Recommit 85d9a7ce317affe2067cd6d9c5c7a6a0fbda91a9 --- run/resourcepacks/unity/assets/TechReborn.xcf | Bin 103124 -> 102805 bytes .../techreborn/blockstates/vacuumfreezer.json | 58 ++++++++++++++++++ .../vacuum_freezer_front_off.png | Bin 0 -> 781 bytes .../greg_machines/vacuum_freezer_front_on.png | Bin 0 -> 1415 bytes .../vacuum_freezer_front_on.png.mcmeta | 6 ++ .../greg_machines/vacuum_freezer_top_off.png | Bin 0 -> 625 bytes .../greg_machines/vacuum_freezer_top_on.png | Bin 0 -> 1242 bytes .../vacuum_freezer_top_on.png.mcmeta | 6 ++ 8 files changed, 70 insertions(+) create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/vacuumfreezer.json create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front_on.png.mcmeta create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/TechReborn.xcf b/run/resourcepacks/unity/assets/TechReborn.xcf index b60d6b9ddbb7b111ffdddd2a945a5a3b3cf1a5a2..d184d1253a23223bb575a196c61f42711f7f730b 100644 GIT binary patch delta 10653 zcmZu$3w%w-)?e$yvm%j`kkH6eMo#2`P|wDrX=pqW?|14=N{DwgI1(fgNkk^H1&K%y zf-7vbRn_BGwHKvaN~<2B6h*ae+lyQMX14fp);^i!{F3>v|5~$V&Dt|-_PMyV&f3yC zIT6@qZ?`UJodQsA3_ydo034?SG~5Q@bQYjdeE^qW0P`XM*DnCv{s+)RVD4T3O*aC( z*&V?19Dr8=fKM`jUnD?_aDaf@04)yzSjGdi8VwNq2q1JVKx-#}HWq;J#sKZ>0(58! z&`Er(UET+Hdj>$anE*Xb0lc#U;N80by;cE4I|B4s2+&Uq6w?)8fEZ{{9>9Jxx54*4|09f)2Ah{mEvNr)%_yD8{4_EF7Sd|2jH5g!Z2*4VF^PT`}g)ILFz`Df%>)!#` zFbbfs2|!UMz^4BIY>o#g`4M0X2iPVeSoR2@Tug44h|C^gV{bWtx)tE#3;^vNE5IjW z7N7nEa3l)gm=Js}mg0-+0AF1LI4!(ATLf@^HNeFq9_r1~gRy*0#Nx&e;Q2b>`Eriht*AUFy80cU*- zI8PW|SOU0sD`4_Qz!e36E7t*Li6s30)=2y(KL|XrmK*=d$Bh@)N)HhEskhhSS^%}* zrdaKMykG4uR$o7VKVM%jKR^HVSJ!@iYqx(u%OFcj7TAidy_|FShaJ8xLqfvZgod=X zQ#R-fG^q#k|Q}Y+jd;UB1;^ZZ6rnWutkWxga-TRk?SuccJ&jjo$gwLwXy_fEPUhVwO%3bH~9IbYKd*!|h_dc$6zT~^|GdH$WJHPIHMPb>N zYUkH2w-z7a)y`)YB`JqirDvv#-&N_!%hJ}*U%NNhyjOU;Yo~dexy)QNXYHPH^B!~A zuJU5BBE{?Gtl8_m&AZgQq*TnH&|5jO1l#k(dS3-}qFDqYv+DPwSp6~F`p|v6O=f`! zp4w)X?AvCR?AvCR?AvCR-mjkDGT9fI#XtKc%x0K!3ESp??Azvm?Azvm?Azvm-me}e zSN25?@R%pI!&FGvcC}>RcC}>RcC}>RcD3|=^)TyXU#u3dd@_K)*WgQZ;VzD@E&(*C zj_vu2M&bOFlRLLM{xd*q-+Hroz#EEP(H3hsS)JU_5d-E>Sgx3p*l=yBPD+*W3ju{x zBH7M+Ddv1!J?`8X11?ioQXBnDu|_Y1;lBf3P*gI_V(-^m)eOwus<$}=0}Qz&sjlNF z)peFS%e4gth||H=f~2~MBgqzXJER_RYlZ=rC@iUs?^CStGydGepV#v^!J~HnFic7AyC`R;F<*)Y|b+PXk$b3cNVT((y z?{td!E>frZuSe!DY7ZmVU(^h?n15F_FyIWbfHx>E?FM*JEFe^E)-nwl(@>yL zRrSlj{m25>P+W2Yw^A(dV|8}mRHK3~BMTPQpx$iKA-EUCf`_T^ zgib{ka-8DQZipfKLhh*N!&V>*GsIGI!!;YNYi}x+BXt$^y56eHbk!s6&&Tx&<5}JRlCt=_5z?LI>t*|Up@_1sBu$?YksVOws`bLyv&tC2;H zrMToq&ZSu7ay2okhlxdfNpZ=Ix=OLApZTYef$HDA2O#$5<2+p(_ZBs}-m1LpEjJ)O zpwDpid~_WXi+)7K(r6!~SRWUDEY?@`>gR)&zT!@yH=70PD=sCrSl0 z0}NcMP9OXT*avrN3r2;Rj-i&CN^>e#U*#7VbdPDSUo#426^mwM}A^V1sg5bP&S(hj4pZwy~alW zqgvFx zDifwqY{CMm@{dVeeKsi!*`x?6mMW7B;hr>J?LXyvWK(M3PBCz&2yVPM#^P(Z48XS=B=}*&)Y?@d56{Q z3zi{U(1YUA^nxK2TQEr-u<#hNg)J#AxeN8DQs7lNwy=-dA?bvPEpoBvE()O7qV}rq zl0(QA*HBUyxb!H^Fl@R>eY`Tw z#4=Xdb2BzkEMt$lA#*c^XBzTX+RZdvvv{E^{ z8yzS+M(vWLBFhmnz1eIjIflA0Cs4%bE`Of;n5}tfPtP?|EZ0wU%5yNWyc)7A&yZbt zefVSL9AC8F%srF}wzh_Ft~G=+UxZW1MT?S8hn2Hb$|i`wDuEm0nj*ZC#0MYdpoJ-K~o$ zwlzy#ST+YOWrk8#a?6@fZW$AOZr#yI?Z0CRvhAm-SgLHlL9y+>s4=^XkT2X-!FJX# z&7Fp6?iAD9-QUD^tJIFPz57dw?Y_)|4n^}L2OQO=6=GZ1^MuN!PKEgBttwmN0~$4=hnXI4G`u z2b)n`S~?g?v4at6&>?q|<!-ix${C%~G zFY=gU6_%ro?bVJNDuJV&q}r3?lhmx^=h1Y0F301pZs}C9{Pq)R7!D0ZT?R9kcMj#}$WPvm2pCi0xG9Qm1L4cN)gC{?PTJWsKcm8$i;vxy)1 z+L7NoRl)xC4=R^B|N1Az{&hh;a{91|oynoNa0v1F^t#0&CZ;)^aV=hjQfs`b)()Tex@vrhVdnpC~ipJJEdc=Y8T z*tg>A5xrGel+Z9+u$#S)ZJ^rd;kH30I*i&0y zcSiN#^=xFG$oS6uUi{TW|lx zWA0X1?$nUWcMQ3FN6+Q4Kh04${1kweyWdi4a)i4ND0cU`=<_l6yYRUCoz=MeKFIFn zQHoT%x1D154hqLk@(+Igg*~WY&JPT8e!#`s;K}NaUox=vpv39%bCu)<=)qGS`-pEU zX14WseY}Z59vP}~Ir^gkbo58#^pkPMV^1FYtA}o)kzBQ^_PBl3KQ`I(_&tg}9#Q2{ z8S+N|@!&qriEUmV<&hqmQd(;?L7hDNpJ?Jx8&p zH&pAxUyvXCBZx0}md4}%bYy>IQI6F6V>8A6*el$gwC}$QP;sX2h&-}y8ejE4NA_Y5l}nu$pHu9`zvWn}-(Ry(X^&#CW`8@fml2dC6<->P z%a`NTzJK3G<)s6rDTfgq8QiqfLii8C5Nm0V5gVD5H&%<(_{N;r=4=%~e6!`SgOEWC ziw<-PMTf67trp%yrB;1RSG?&0%&mr~ zxf!D7Hd))&7_TF1BJcdNRX=RlWaKNT3d1HJXyxv>6q)-&BGBjj`f~7^?9oVzZHf<& zHT|DGxtSbAwpXKJGaqg2n|RX1Jny~2ZQbys2C%uK*4GQgiy^N{d$QN>1ViuIGJZdz z$>(Rq*9To){-$zYXH6`Pcn#=xkO=fS`JEvc`u(7Jw!mA+S{x$+o!sIg!LY@TiU_Tb z7Rm6ac=`PWk?IEtQkAdMu&?5=6o)xx6&Dv4=H}<+tjS1Hl9r-> z!@^}eXZ7l=>{aQ@)8@->kb5ad+hUv&E543(EZDiLeEa4tn+uBzGL$9B*utqiM;O?M z8^2qhpO?Q}erelF`F$k@DG$T3oiZc^{T++;s1>`nm2WRCD_o;wEx{HI_vUXaEiEZ2 z-CVf7aFzaDsiL;S&sjVB0}b2J0}b1a(>AupNb!2Tj7(3Ta(jB7VEfZroemgoVjZiv zwgK(vMhsxb7TWur@V<$4aV7%Yau2!?%bY0dlLTgdt~BLbb=k6y2^Uxc=>Kh_rS z)eSEOkgwRzp4yGvxEIaBaqL zJRn}a|7>r0xM4#d;jBfE#9xt(GTD{^jfP1lPot}f(>iPO zrel-?n~_4S=;Rss1j8BIw91+IjRTua(@ZDN&ZOko8@0=G@M{M)e;N_!P%4(y`@BGolMN+uY7v_=ye!yUwZBeCP_91*qYlF5Xp>n{0-V7Meh_N$I5 zKkcy(KnJrE)7LW(M2Vt`W7XU6d^>h5EhwdeBJM67~*3- z?$^0&%w=rMWy5AJznR(W=V!+L&-0Og-}9;GRWCj7^FHT1=RD{0Jm>S-7H_D2byM|) zJ+Z^CUVd1Z3Q%(>K<(}T#vFh;TLJ980kE$F;Lrh}-gE%RF98|=K%RtvyS z{1*0z0O(}~2uKF#a{!?41c2c007CKs`u_tEmH`kU91Uy-5G@=Hnh7v?1VDTffP_&1 zNm~GtZvYGn07x4Lke&oEQv8nU2QXUvJ4V9RSO-09N_{tm+T2 zraHjdsQ~MK2G|e}u<SD2ZYyvHWvY_Cjr(h{1&iwGN4@# zK>LA!^@ae}-wxPt7obxlU=yLxJRYz`6kw|aK-Z>#ZXSSbya3&W5s&Wy+dTkme;2UB zdcaN_0ezhTyG{i3%LVLV0PHyn(EkizAAi8U0f0eA0Q)@#47~-IKEM|+tPn8#bHIo@ zfCIk)jNS`4Xer>}X@K!5fC-ZUlez(#M*t2h08AB&9xn7oh682_&X_*|$2|v}D2z@K z3n};+@PnIxv#$fry9T)6Do?Ivvi#+TAM)C^jomy&G0P!#L;I};U@OW;8|9eoKptZ2 zS7@HPXnm_z&Mxzdmfu`_^4|97Ic+>lZBBl+ZQ9~%3lH7e;y+>87BBDio*N1leY@n? z-8H_c9on`xoj;&vmRy*>?`o;fprR!LX}_dj(J?+|;!y7ao`QaS%eur{~<$XT;i&OI_? zMnV3;smmvi2^n6rY})>5hx79fPCT5yJ~PrhrC{ou{JflrQ*v_0A!)OsD?*A%4K~k+j*N*EKhcr>!y;4qBxFZ4ALE>1%ot%m%sIt5IUr$7 znoFuf%82v?yFt#0L;T|=I;ReI`=PjuJtwD+5*I-8B= zMEk+cvCh%H;i>U1@eYF$6C&+Gog)YMhGsg)8wc7)#n?sIhqUbP7idn3OG=21iHePi z2JHgFHd^j#>(ARDYmW~Ik&DGIk&DGIk&DGIk&DGZEof6DREaO#n!ti=hnL^=hnL^ z=hnL^=hnNa&8^(c_$!3>t$oI=0Zp?^z0pK5V>iXyXhgRl3QKC8Arz}KN*Pv1P{k>& z4XeY(?n8>%t>E6qP=4F)pxZhsk%sGjPO-YDl*4r!pxaFfORD`-irN1w4Et~ohx2aY z($I$0GU_=}te&gVw4Nur>B>zSb{tNrjuVtD$JXe!oWhb?U)+t_DECzVh_bhS6U6WN zY#VO@- z^CieyiS|PqRyl7aS{Q4r)eL2Ri&My4MZ02+%Qd(rQp|OqOfip5$}aap zWbH&lqYbM(wChf>cA-kF$2DZ_Mbo0^w(ml*_Q6VYyOGGec2Qie!Rr*oyuMZLdd@I^L(awA4{_yV@vUwNEXr^tyU~VeLb&7RrDCT@~ z$3VWdV}P=?V^3tAf1nhp)>&uD*Pz&S68qNWQe|$JpDEVm`EK7|(bVl8g{9eU|D{-W zxjLTM^&_6#HCTDlwK|&oM9-@Yt6lMXO|kduh&lhgd!|y{{UEmO*_Dc=r=Ft8*G9RS zo?6km^09rr_^O^Sc*(uSJTkNzFYCeE`gfyTsqY^~F@No$(e#y7JvSrkt*aEN)LXQ| z+9-G0+pLW8_cO4-6%?1;K+!^5a|4em=X#eS3yP$;{q z?fbVxQ+ObiNq%@7#llC5Irj`R^A2GNN{6s1$RgKLid2i-L$Sy&luO|O*fy$)b1_PH zE=IMLx<34)z+j~)@(QvTT|Gz#F)7qROpY=&>It$~@s^^E@{~w!Y%axOii zH^n74PM7Ambjk7I4n16z<*{Rs#lNYnG^8HIhPWv0=x`S>ea_2?&_|p$wvsw2lo1Ue+-DX!Wr-$*6do|`mW?5MAgUV{fuP8RB zw$fpy&}V_Jex=<7x+80Wc4YO1 zS0;CN6V%{k^L&)uCAr8J>JD0|ywHm}TG&hJzd%9u(Q}GR?jl{2xX4N5=okLpN53)t zTV?vk28w-LPjOykV_-|FsIDct>RRH*-z>h!OP1E-?u*NqrHXV~bm_E+bS_?mre(9K zTen8Fhs~7S5Ys*aQ4^*bF*QI#9>@2zcx)8;8oei>$x;l}o*{Hi0HbyJS>jxp* zB(p1r)gis<$XnEYi#8jwp6FwEe*w- zmu~K+m^Y6=w)G$tOO>q`DYo@TC3)Lwba0A=9f!dL_cd8WI zd4_l27s@Z}F)F4V;#}BuhsveSF5RQHyP9HOmS!;Q8O6u$adar48haKf%Xfc^Y_IP1 zSz6jVnR55eRTl3#ifmsf#U*#2nPU6KC{y-|H^Bq%QCxBlI8*FEd!_rnMh4TNV2Vrb zp#+K@$`o_H?(lHs#{-wqbmS8%mMTYd<#^<)3YAvKlaG{{j@wpNJFe>mj++E$(Xrvm zs-wcu$+XHECnr(tq`W_Q{)t>Z^~5-3>WO)1I`t2w$n~9;wJAq=jh=2P{^skxxUbYd z)eO16XEtARx{jq?Cw#9BoZT*&VptXQ+2e1aci7p>Z$D97IA`SlJ6p!it)_D6^xSTW zojaji`0|i}U6@XB$-VF~#V%}A%FgdMu*+36!$OD8jk*8zYW%8mG57e+ z$gYe35TgyNoL%>)*!4&y@wG(9{`t;t+Gyg{*tkEKf113y0IL3d@$gOzAut^%|ANx8h@SS)1Nf6 zy!1mSp3^A1qy4+bTzGowO5MpNJncfUr@>0;nh@S!Z-L8^ZfrB*$epq$YE8e zFG}A+@30qZ_{CT0isOrk$oIq-bNiP@_P6BAVWszX>$lK5?C(xW@0VA_HT1t?zUq~c z{j-Y7<#PYgeV+Q~xN`B;cgP#QD(3Cp7}>v7JV^igQ#=1gD&{wjkZ*cjy!Zkd8R{;6 z;RliSR)~M>MYK0q&dtT*j@92O0AMu>H7=E_Z6g>~JE(qXgLlwkZ-d2_4%LOv8XX7) zq*{$Yf?W=!j2w9_f#GdA(5xt(U(GE4eAx=luxQcCTtlP%M zF{;rCA0un(U)gfg7=mHbG__e1JZ)gkl?xf2sR4A3RBJXz@qMVJ8?mCTxn(zkVapJi z$)AzARPON5r4J>$L|X#v@TTRLR(RgzTDc>@*7SMC)-8nrOSUV9sqU^KjRscDa-5-~ zgA+B(+*OhAAH{d^cZFGTAfS75N_O{D?=zf%%v44MT70H22!^JsYKc4kfUNBvBGAZf z&k_vVURM`-;9X>%mD^+VyhzEOKUzeZnR>V#?i3%$_Y$dQ-s>xZq1TPK>C5uML(E%u zQ^+#+E~X0J7EAGLjJAAVfSoM0OVPzR<%3x>rsqwWJRvV9)6$~|UF#I(PMR=&eD3&h z*_mU~Em=kAVp&j(5tiG9LdR~Q(8D7nL=k$?&wh&86z{&Q&Wbe zT5@Jeof34j?45%imfH(4);KmZYt+c()Rd&;!9y**=3{GPc1luWVnSkkZ1kW+OZI&1 zY#Hx^Ct2sIWXW3Gofi@eJFiufI$Dm2>Mzo)430Ga_!Az&j_2-u^J^~VVDCEb*;1Og|8;C%&9HkNrqs~aO9a^`gGuI{p&9b=#!O-lb{+ftR$dW^dKqDt75e$>FR1Y)W zu`#4ZScayGZBC`~)Lga0Fccrk)9BNp8B3!TifL!nS*h||Nw*_bG;+EN!7#m}`ZNuH zH?WM>M4*u~x)KaC`l+@fv9=8xO*5mBN7IeO(UVo*OboJN*}B(Rd8B85OD$*LSJ#ih zOExT*R+eTt_Z%hX-c*;4!>?^v-c};e$azNyhItn(^QT}lb@N0#X2bG7BT`Kx{}{nA z|B@;+;%v0H5b=L%yc<}!i4ZmA!uAo diff --git a/run/resourcepacks/unity/assets/techreborn/blockstates/vacuumfreezer.json b/run/resourcepacks/unity/assets/techreborn/blockstates/vacuumfreezer.json new file mode 100644 index 000000000..1df9af1fb --- /dev/null +++ b/run/resourcepacks/unity/assets/techreborn/blockstates/vacuumfreezer.json @@ -0,0 +1,58 @@ +{ + "forge_marker":1, + "defaults":{ + "transform":"forge:default-block", + "model":"orientable", + "textures":{ + "particle":"techreborn:blocks/machine/greg_machines/machine_side", + "down":"techreborn:blocks/machine/greg_machines/machine_bottom", + "side":"techreborn:blocks/machine/greg_machines/machine_side" + } + }, + "variants":{ + "inventory":{ + "transform":"forge:default-block", + "textures":{ + "top": "techreborn:blocks/machine/greg_machines/vacuum_freezer_top_off", + "front":"techreborn:blocks/machine/greg_machines/vacuum_freezer_front_off" + } + }, + "facing":{ + "north":{ + + }, + "east":{ + "y":90 + }, + "south":{ + "y":180 + }, + "west":{ + "y":270 + } + }, + "active":{ + "true":{ + "textures":{ + "top": "techreborn:blocks/machine/greg_machines/vacuum_freezer_top_on", + "front":"techreborn:blocks/machine/greg_machines/vacuum_freezer_front_on" + } + }, + "false":{ + "textures":{ + "top": "techreborn:blocks/machine/greg_machines/vacuum_freezer_top_on", + "front":"techreborn:blocks/machine/greg_machines/vacuum_freezer_front_on" + } + } + }, + "inventory": { + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machine/greg_machines/machine_side", + "side": "techreborn:blocks/machine/greg_machines/machine_side", + "top": "techreborn:blocks/machine/greg_machines/vacuum_freezer_top_off", + "front":"techreborn:blocks/machine/greg_machines/vacuum_freezer_front_off" + } + } + } +} diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front_off.png new file mode 100644 index 0000000000000000000000000000000000000000..4ea05b50fae783fd42d752d8a7070843d7b49e10 GIT binary patch literal 781 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 VaP%k~Tju}(002ovPDHLkV1i&xtJ?qo literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front_on.png.mcmeta new file mode 100644 index 000000000..1685882be --- /dev/null +++ b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_front_on.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_off.png new file mode 100644 index 0000000000000000000000000000000000000000..a1861c709ef8cdb2a7ea00d61c5dbd1a9adb159d GIT binary patch literal 625 zcmV-%0*?KOP)2 z$vLOHt164{oNt_ksZB%CUGG~@RhQr2UgmHofqn0Y2tI@9PDB#n0Axa~l`%TCR(87` zs)qGB`Q^zuy&n(}N-3NoGf`Cl+#UBoRQU4wGi^EJ-PJWBBJ_UX?Dsn?a#e{4 z`k{0A=U@C^ym)fXoP+!K?$TPr+;1$`RsneZ>gCpsh-_`W`SmwU1;zMxcOVn&aOjvB z?oJ$wMXddvfMzDGwIj@6cv7oT3fOdqInYv2Ew=!UvGOsqEhi;e1R`_g6CU*GNGT-i zrEf=hic`)+K-R^`Oe`~q3@Ab=ddoqrEB#W+jVn(?1vNueF;xR#dT{5?vZ*c0g1e)t zxclZnZ55ewVrJN!6Aw5$TiEUUM*Dj)`k*cCC7qnW}zRZ|?psL$$sOtLB+`0PW`o;leCHnKTr)V{b2&zImKKyn9 zB0^^J^rs(bZDEdysR-|`u8B;v$OfsDa@@j1WSxSD07>R5+I#0e{pvWogCR*$00000 LNkvXXu0mjf#p)f0 literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_on.png new file mode 100644 index 0000000000000000000000000000000000000000..69bb2778012f07cc61c0ba2ddcb9194591a00a2f GIT binary patch literal 1242 zcmV<01SR{4P);lEE+^~~7TICg9&RxTKnn`|O;dx}Va1Uv$4Kw$||_AFR}*zpJv zD-av@i4& zkr1l1oppo|(771}w9awy{CN&~J&Iz0j;UHD#)vH~w|~3G^PYDWFXFvpVtkA|&(R?~ zN!jEEfN#J4ihj3Czt=@XP}(qge1^}zyoOeSLen3Vqy)MwEm~_r2*hEq-K|Z!k9S9D zXIVzxXbg)PaUo%hCd)wk5WqWBmZ4PDfpRb)#)$VG0Aq5TEdh`$(GZ9!RrQG>Vtqie zj6}7fHUr_q#285_kq@^OV?-&9qy(ZgH*Vb`H>TQ` z)_ChsN{!BjQmVRWA#mr{yH7G8t19~DmD)z&npt zBHX-lmzWYNlTnefEJH+yF(HzXQbI(4L`v17)>`z5>0|tx2QeOcAUNkL4~pW*gXekh z{deDB%aWphfQTTX8Ed!sL{=mXGfjZyUb z^*yMraUAVC#(*mZ^*u0+1{0H0w8mZalGYrCtL4GOF@6&O2`{6#wXi+@Zm@GJm_q$v$Ou_i3i4T_QIw59z5RKWN&AO zG;Bzgpu4+U-vebdAvl~n{J_uz=jwYfIX#PW9&Za$N;H}+8sii7J(z!GfytTUl>I&; z3X|uUW~;sjSFT(+^5DpWm&gMH%+Jr!dE6z4)c2qviItT<@Yd4pY|`r;aQfVZ`X0=* z+pH+X#?Cg~?mpwq7L8#yYI*QzV~wq?4WjoPlqHfPgMP2R2m5`?vAKE9O|>bDlD*ym z1NQ>|3v;K>aC+e^XHJ|X#K6P#4I=X2Jy<;Q;K+mj#e<)J`jK9DpLVmw^5sR=Hn&;b z-r?Q%-mmAuM6Ov`eZWo#sA%bQb{RW9`;Q*T$O95)=)uCNQ_RoJ(L3nz`@MVEqF`?7 z*i#-Tp5wvV`XkoXR*Bx@t;OXfwk+yMP^T) zVByqhW@o0En7Pl|R;RuPOUuhowQlK+w^=&!;F%u$1xle^VMfOdZvX%Q07*qoM6N<$ Ef-{^;y#N3J literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_on.png.mcmeta new file mode 100644 index 000000000..1685882be --- /dev/null +++ b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/greg_machines/vacuum_freezer_top_on.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} From 7951e9913efd515b8ea3b6ad0d4fe0919a24bd27 Mon Sep 17 00:00:00 2001 From: Prospector Date: Fri, 3 Jun 2016 13:05:08 -0700 Subject: [PATCH 2/5] Armour textures --- .../textures/models/armor/bronze_layer_1.png | Bin 0 -> 2353 bytes .../textures/models/armor/bronze_layer_2.png | Bin 0 -> 1185 bytes .../textures/models/armor/peridot_layer_1.png | Bin 0 -> 2334 bytes .../textures/models/armor/peridot_layer_2.png | Bin 0 -> 914 bytes .../textures/models/armor/ruby_layer_1.png | Bin 0 -> 2300 bytes .../textures/models/armor/ruby_layer_2.png | Bin 0 -> 912 bytes .../textures/models/armor/sapphire_layer_1.png | Bin 0 -> 2290 bytes .../textures/models/armor/sapphire_layer_2.png | Bin 0 -> 913 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/models/armor/bronze_layer_1.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/models/armor/bronze_layer_2.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/models/armor/peridot_layer_1.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/models/armor/peridot_layer_2.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/models/armor/ruby_layer_1.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/models/armor/ruby_layer_2.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/models/armor/sapphire_layer_1.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/models/armor/sapphire_layer_2.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/models/armor/bronze_layer_1.png b/run/resourcepacks/unity/assets/techreborn/textures/models/armor/bronze_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ab22ed8706c2ddb8cd003f9dfb6e46b035abadac GIT binary patch literal 2353 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 Xlhii?hN-e600000NkvXXu0mjf;bL&= literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/models/armor/bronze_layer_2.png b/run/resourcepacks/unity/assets/techreborn/textures/models/armor/bronze_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..43b307ccd852aba2fc4b643e28a5c9d7bb920cb1 GIT binary patch literal 1185 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 VN2bZe?^J zG%heMIczh2P5=N1dPzh>jK5awdl}c=*eR>@x6XH>_@sD`eQm%O4>jK5awWtZ+j;7EjZE!Hg zDCpE_&>S9y%585z8yw0=MpKv;EA7>2rHaov|3gO&8ntS)kV(aLc`9-%<$f{#q$Lr{Z?bRv-P0&k9`< z3CmTxF-P^_ph=GhH5Hh5WMVum9?MPDn6suzk$hNLj;S;Y4#k`BV|O#|R~FOr!g0oK zBhnkzpMb6~4SEd`M1mFjjFH%HHekwPL1(B2Ly6HsLOVsqMH`W{rwX^LO2lBkZ#FXx zJ!DKzR5%v$>}aPoe#U8Q+LM$?iV<>oz1N_}LO~WT6gp-72oZn2z`p(jv_ytV3bdJY z0zN1oekjHuS0?A_=9Pn8k_z`*cBxM9%vCW#!%1}eR!O2Mcj9S1D2>rViC^X)LTRCe~h(x#{2NZg=|YF%9wvc9 zpTm6A5+`7<&r_;ga+Ale&f#%?J3g=QNX<}s#;b(l;~hi%F0?zwhq&*QNsj2I1~Ta@-Z4-^;IV%nLCrE)K(Y^nbfRr@a)7ToaUVLHWv zKbg%hpMZ8_1O{RaIGT|tg-dDAtHeZn3@$kB_~Bp=-b+n<`2@5^X+_4e_j?kI>rMa* ztz*gYn6xCJB~<9`HFdM@pgvK+IMd6L4CH&@KBk2hkh>sS*w2#CU=kclJ zM6gH8XsrJA{^lqRKFrC)g3p2ZLOUMR`SFR{Axe|y2v(OzNr>_9572eQmO{UsBzogk zu?JJMJ`ofBy96mNJ`ZYl1X4ebAoZsO8+qAZfGa!mFqNPE%a6ZHhg#^frbtz`ZD3<88>OlAdHll^@ zWqolt+k(Rm%fFKnzlJsq84whR%B=w?+4Kig2X8}$yWM=kL( zFdc}|i`>0V2fkbG#@*6fT%d#ebmk;(RQm7q>wC)y|ztJ0peP+WW-un~BCKwqVz$jq;fbU0rC9c#QY3*EtMZ zqQb=E{BmO~#)Q2=L88t+B?4whI9;K1_;$A!*Xi%e1y1>n!~aNJG|o7!k`m{37QT&$?F{y zIR~R7F&t--l;H1zt=w``q|jxerVJB1Hn&P*#Qg(FPGmOvvXoKGmNKY`@vd zc-p#-bxHDD9-F5*Jz|VMA#Jo7Hs{RS| W3G5ypH*EO;00007a)=v9{rm~afNhdK#ZkZ+5tFT=1=se5# z|I$&H6;IyPlM!S(T>km^l33YI8#Ax1yD9Y~{FJKn{yjm(&uTWgZK|B}FtRvy^~~yM z0cU5wY%7%=oyL7%uO3}x;xD`X<6PnW?M+j+o-lS>T=zIb>e!ivIgv-MY)rT9Eq0w} zdS%Np=O*c;^WMF2IJlS5`ZV_@lc1u?Yb9={^DNvppZ&$m5G{OtP2rj=3|SfX?71J` zU$(sHe*WDphS?yE%hm`MJMZ4NK7Lx*#`DMgvz4!z6t8LhIrnL0iEND&K5O zVz?8WEc-pevSEF%bQwp-LdE5#vO+$VUrQ3pHrHJ}R(Fnlr{!nq#Qgl(tOjk*ety~b zJeon)A=&m^()p|F7cK)SzA4$Rc!Z_;MMvQAs267z208?*y+8Aqv&g@<)aLo(ry#e? zws3B5^zTh${2uXB_JBI~j`X=Z{a(o=Wpr!>%69Hn&&!+9WaXGERwMr-K_g;zYt1S) z?c%WSk8U2c`#pVWq|Tdl)e0b&eZM8yY-zHjQ6?dmt9#_J0ruRgkVOXQsMIr;6E_0LZ`RHY|BzGRjApMB$3V7wK&WeBa8UFa6^ z`tbInd-nCspS!Kb=-76t$4Pcf)2=6rt3<|@n%b~W+Pbc0#>{Er)6bpyTpU{Y?D>>s z&X+!Szg;ln;Ew(i`yGJMxoTx|!+BGK{N~o`_{$%%w@l6OZC5_|mq{r`eeS{6-#LJ} Ohr!d;&t;ucLK6Vo4x;V= literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/models/armor/sapphire_layer_1.png b/run/resourcepacks/unity/assets/techreborn/textures/models/armor/sapphire_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..8d64113f81665b24a340d2b541a21a324ec125b3 GIT binary patch literal 2290 zcmVN2bZe?^J zG%heMIczh2P5=N1a7jc#RA@uxS@}~`*%j`;U>wJCq1hUd?iL!P_ipHJ8ff-SWm6m$ zkwpYr1scJPO(%fcIEs!UpqU{sahWAy5)(9(&H#dwOF4X z``$g@J#1QP`i$!^6VlU4bw>Q&mze`hxoEd*baScn{ z@Cn!uTZ_o-0YsONLzC8vi1a>$dCx$*cL*ODD&YIjLtu;b2twUQr3^;;dIiCBALjPs zlla5$e;G99_K|VT$ZT4mtR4Wze3t(g1Sd8jg6jWX|4X@Q(?5f==8v!(d<1Rkd2AsK zz{zo|yA44}0rXv8gx>cXn%9H+z86vHgSH*hSCTnK_8e6_G3@SBHVR9Bh-5qrhWI2*S@&^1gKpB zXp&CS=0_2cd>WCdXQ3+^f;y2-onoFz2qMpjDVuQZ~furOyELaa^l%pJ*{&?J+LrX0c{#j4Vn zdl9DG3$W%5ATG0K{R!aH3`*#b%+9B;G-(O!37i0v4$Z2Z#UqMym;`oxO>z(P83O`7 z_4tx8nDB> zvHmd|>yjicr8#Q}EtS#uPbW~(y@=@i>#I*d1Z8TLv3&YETMfQ6PW`x5l| zLsXL6R-b@hLrmc?EQO=crJsj^WH2i{LstJA8;ha*p-t-+!K6t(BXJy6cnf@@8)B;8 zm>+I$g^8YRFPVU~@E(#IXGKpi0o+Hhy3}T00l!~Io@vVOM_dMZ2k8yx;lGj^y@jZp zOTS8x;^5n0i?sof?sk&IjbJ0)Wsl%I@BohD+pk|9mwy!_lk-S9`jk$sozM*KGP#=! zA&tP_9NeGwNngP|0;|t(haYjI7?}V^$vBc4X0VeaHcNE1r4btpH3&^?6@3w(eh%hz z5?v(1Skk)>KZUt)44f~P?^OwkgKvWkaaFP*mb!crbptP9FP%V2)0}jT&f3RtS3g6x ze-5|C=b`olz+aj-8SC*;bQLxm8xZd8fT#K{4s=R$gv!qEkbUq9B0U{s&o>zsPhG5t3N`5SF~_B(eL1Ojffz*IYJ9iF*wQ;O4|;0=?H>!dv|(Sm>TNzLicbEW022l3}@~ReTOt)fha-XVG`_1*%Rxf+6QK z7>jO8GnLdhM?{RvJGc$k5D7|qVK{exDR4CWMZ!U8&T=RYz75!Y`SgQaN5r_8;yXyF znvIBzY}oCa2Tj5BsedWHV;cYN7IRW$~nQEkVeZu^`3JI z6T#2tgdCOHwW47Odv2**g~O^HzAoulmF6sm;^5nWjR>*%vDsQL*p}D{Q{@wwDxSbv z{S#~lpTSJ9R7^<%n|J<`LgZO!6l!IWva%&?*S-yiPxmk0M#_?o)#L3eK7t`JiGd8YL1Qz4ic3Vo~l6#HMz`l6xIdN$r%~+i7hNy{k_` zf`2n*U0r`h$ic+Jk# zQ)?o;RHoc7M7)T>1WrWStjo}nR}`OJKy-S)5W^n9-oeR*1r1+$OzENgJD0)4`llpb z9=@*MoSc;Avwnz6??ZH27xXD7MRl?U;B2lm|6M}msr=y;<9XK*>?U=U^-4`~_H~rq z7f}+$gs=vuagI}4-L%x&#QGUU0@zSig;7Mrk^)Swno`*dhTfRVcwM^kE~uOZ7gdhJ zOEPz*`R@{{XdlHll?xUT`huIV)=iO=oQ9DU7;l^jVDZAslu#P*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQK+iJAxXzD(ftlaa z#W5tq`RTON*};JV$3EwGEalhTvQ(7&mD9=@N4A7aWI5P$W2%x9%hp$?*cU3@`lXTN zdeGxS>w=}+=B|PV*$W>oZaQk8VROIbeZl*)5uTQMPju?$Sl&OgvwYu9^X+F%XP;eR zcyxvV(db0%s`blm7!|r7IPhfAmuV(>t0VcZG%q}LS>%fK-g#F`JZ|N^keV{F$hqtI z^pxnO`xY{$oSpnXjUl>w`;w9(*Q#&#-&HV7`>1nmr+uQS?4)hdNeq%}W|{RWq)Q&1 zw{yuq^EJzyC*9ujyGuag-Kq1ZE-X}++MQN<_L{=|`VR|_-CiD7QS7Ss5q>g*>E@*o;IX$uF z(Wmt>OSdgE%m%uwY1x&I-3!-QFOT;wf4T11;i>Lfvn;P2`g7*5>EGZ^wM?D`m2WmC zG297Gmi-=K*|7I{-75hBXXkTSRw^@!UcEf@W}Wc+XgA@VDkr}B>lLg&%Ov6ax#ri6 z&$D$g?{;|!BX};81rgs}ZNgq(>-jP0cx8Ez7q>PTWK!e|%#(i^47|eq2A-ct$WY+X=>NX%jBK46k#TJ!j*q zJM1fM|7nRov-jNi%k9_k_b*E`xW4|lpv3lc^ZO+m|M=?Z)l59}a{DFod%rjq-vj#a z9*6Ivt;$z8vL}DYEnL6;c~)&`SGwKleXraL?HN;#Z%mz;Tl3x2hTUMz;pgEgUtV}i z&aBdFo| Date: Sat, 4 Jun 2016 11:02:35 +0100 Subject: [PATCH 3/5] Add a way to rename and move the blockstates json file --- .../centrifuge.json} | 0 src/main/java/techreborn/init/ModBlocks.java | 2 +- .../java/techreborn/proxies/ClientProxy.java | 27 ++++++++++++------- .../java/techreborn/proxies/CommonProxy.java | 4 +++ .../centrifuge.json} | 0 5 files changed, 23 insertions(+), 10 deletions(-) rename run/resourcepacks/unity/assets/techreborn/blockstates/{techreborn.centrifuge.json => machines/centrifuge.json} (100%) rename src/main/resources/assets/techreborn/blockstates/{techreborn.centrifuge.json => machines/centrifuge.json} (100%) diff --git a/run/resourcepacks/unity/assets/techreborn/blockstates/techreborn.centrifuge.json b/run/resourcepacks/unity/assets/techreborn/blockstates/machines/centrifuge.json similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/blockstates/techreborn.centrifuge.json rename to run/resourcepacks/unity/assets/techreborn/blockstates/machines/centrifuge.json diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 019527757..dc3b371c9 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -5,7 +5,6 @@ import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import reborncore.common.tile.TileMachineBase; @@ -199,6 +198,7 @@ public class ModBlocks centrifuge = new BlockCentrifuge(); registerBlock(centrifuge, "techreborn.centrifuge"); GameRegistry.registerTileEntity(TileCentrifuge.class, "TileCentrifugeTR"); + Core.proxy.registerCustomBlockSateLocation(centrifuge, "machines/centrifuge"); RollingMachine = new BlockRollingMachine(Material.ROCK); registerBlock(RollingMachine, "rollingmachine"); diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 1133df2b1..7930f2ba8 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -5,18 +5,14 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.resources.IResourceManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Util; -import net.minecraftforge.client.model.ICustomModelLoader; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.ModelDynBucket; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; @@ -24,7 +20,6 @@ import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.registry.GameData; import reborncore.RebornCore; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.common.blocks.BlockMachineBase; @@ -33,19 +28,16 @@ import techreborn.client.ClientMultiBlocks; import techreborn.client.IconSupplier; import techreborn.client.RegisterItemJsons; import techreborn.client.StackToolTipEvent; -import techreborn.client.VersionCheckerClient; import techreborn.client.hud.ChargeHud; import techreborn.client.keybindings.KeyBindings; import techreborn.client.render.entitys.RenderNukePrimed; import techreborn.entitys.EntityNukePrimed; import techreborn.init.ModBlocks; import techreborn.init.ModItems; -import techreborn.init.ModSounds; import techreborn.lib.ModInfo; import techreborn.manual.loader.ManualLoader; import java.io.File; -import java.io.IOException; public class ClientProxy extends CommonProxy { @@ -169,4 +161,21 @@ public class ClientProxy extends CommonProxy } }); } + + @Override + public void registerCustomBlockSateLocation(Block block, String resourceLocation) { + super.registerCustomBlockSateLocation(block, resourceLocation); + ModelLoader.setCustomStateMapper(block, new DefaultStateMapper() + { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) + { + String resourceDomain = Block.REGISTRY.getNameForObject(state.getBlock()).getResourceDomain(); + String propertyString = getPropertyString(state.getProperties()); + return new ModelResourceLocation(resourceDomain + ':' + resourceLocation, propertyString); + } + }); + String resourceDomain = Block.REGISTRY.getNameForObject(block).getResourceDomain(); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), 0, new ModelResourceLocation(resourceDomain + ':' + resourceLocation, "inventory")); + } } diff --git a/src/main/java/techreborn/proxies/CommonProxy.java b/src/main/java/techreborn/proxies/CommonProxy.java index 3fb6d35b6..3c33a0878 100644 --- a/src/main/java/techreborn/proxies/CommonProxy.java +++ b/src/main/java/techreborn/proxies/CommonProxy.java @@ -38,4 +38,8 @@ public class CommonProxy implements ICompatModule } + public void registerCustomBlockSateLocation(Block block, String name) { + + } + } diff --git a/src/main/resources/assets/techreborn/blockstates/techreborn.centrifuge.json b/src/main/resources/assets/techreborn/blockstates/machines/centrifuge.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/techreborn.centrifuge.json rename to src/main/resources/assets/techreborn/blockstates/machines/centrifuge.json From d3bd2bf70b903aa034f388bd4d3bc829355a5315 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 4 Jun 2016 11:14:34 +0100 Subject: [PATCH 4/5] Add a safety check to close #619 --- src/main/java/techreborn/world/TechRebornWorldGen.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/world/TechRebornWorldGen.java b/src/main/java/techreborn/world/TechRebornWorldGen.java index 234de869f..82c28747e 100644 --- a/src/main/java/techreborn/world/TechRebornWorldGen.java +++ b/src/main/java/techreborn/world/TechRebornWorldGen.java @@ -227,7 +227,12 @@ public class TechRebornWorldGen implements IWorldGenerator yPos = 10 + random.nextInt(ore.maxYHeight - ore.minYHeight); zPos = chunkZ * 16 + random.nextInt(16); BlockPos pos = new BlockPos(xPos, yPos, zPos); - worldGenMinable.generate(world, random, pos); + try{ + worldGenMinable.generate(world, random, pos); + } catch (ArrayIndexOutOfBoundsException e){ + Core.logHelper.error("Something bad is happening during world gen the ore " + ore.blockNiceName + " caused a crash when generating. Report this to the TechReborn devs with a log"); + } + } } } From 1a0fb025167d9d55b1596ba66774a5809e49fb46 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 4 Jun 2016 11:20:06 +0100 Subject: [PATCH 5/5] Added config to disable gem tools and armour, closes #617 --- .../techreborn/config/ConfigTechReborn.java | 5 + src/main/java/techreborn/init/ModItems.java | 148 +++++++++--------- src/main/java/techreborn/init/ModRecipes.java | 40 ++--- 3 files changed, 102 insertions(+), 91 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index c3ebb0462..2c5a3e0fa 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -141,6 +141,9 @@ public class ConfigTechReborn // EMC public static boolean UseConnectedTextures; public static boolean OreUnifer; + + public static boolean enableGemArmorAndTools; + public static Configuration config; private static ConfigTechReborn instance = null; @@ -370,6 +373,8 @@ public class ConfigTechReborn .get(CATEGORY_FEATURES, "Frequency Transmitter tooltips", true, "Allow Frequency Transmitter to display tooltip info") .getBoolean(true); + enableGemArmorAndTools = config.get(CATEGORY_FEATURES, "Gem tools and armor", true, "Should the gem tools and armor be added to the game").getBoolean(true); + // Crafting ExpensiveMacerator = config .get(CATEGORY_CRAFTING, "Expensive Macerator", true, "Allow TechReborn to change the Macerator recipe") diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 7693a9bd6..cba8404eb 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -13,6 +13,7 @@ import reborncore.common.util.BucketHandler; import techreborn.Core; import techreborn.api.Reference; import techreborn.blocks.BlockMachineFrame; +import techreborn.config.ConfigTechReborn; import techreborn.events.OreUnifier; import techreborn.items.*; import techreborn.items.armor.ItemLapotronPack; @@ -186,85 +187,88 @@ public class ModItems advancedJackhammer = PoweredItem.createItem(ItemAdvancedJackhammer.class); registerItem(advancedJackhammer, "ironjackhammer"); - bronzeSword = new ItemTRSword(Reference.BRONZE); - registerItem(bronzeSword, "bronzeSword"); - bronzePickaxe = new ItemTRPickaxe(Reference.BRONZE); - registerItem(bronzePickaxe, "bronzePickaxe"); - bronzeSpade = new ItemTRSpade(Reference.BRONZE); - registerItem(bronzeSpade, "bronzeSpade"); - bronzeAxe = new ItemTRAxe(Reference.BRONZE); - registerItem(bronzeAxe, "bronzeAxe"); - bronzeHoe = new ItemTRHoe(Reference.BRONZE); - registerItem(bronzeHoe, "bronzeHoe"); + if(ConfigTechReborn.enableGemArmorAndTools){ + bronzeSword = new ItemTRSword(Reference.BRONZE); + registerItem(bronzeSword, "bronzeSword"); + bronzePickaxe = new ItemTRPickaxe(Reference.BRONZE); + registerItem(bronzePickaxe, "bronzePickaxe"); + bronzeSpade = new ItemTRSpade(Reference.BRONZE); + registerItem(bronzeSpade, "bronzeSpade"); + bronzeAxe = new ItemTRAxe(Reference.BRONZE); + registerItem(bronzeAxe, "bronzeAxe"); + bronzeHoe = new ItemTRHoe(Reference.BRONZE); + registerItem(bronzeHoe, "bronzeHoe"); - bronzeHelmet = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.HEAD); - registerItem(bronzeHelmet, "bronzeHelmet"); - bronzeChestplate = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.CHEST); - registerItem(bronzeChestplate, "bronzeChestplate"); - bronzeLeggings = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.LEGS); - registerItem(bronzeLeggings, "bronzeLeggings"); - bronzeBoots = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.FEET); - registerItem(bronzeBoots, "bronzeBoots"); + bronzeHelmet = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.HEAD); + registerItem(bronzeHelmet, "bronzeHelmet"); + bronzeChestplate = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.CHEST); + registerItem(bronzeChestplate, "bronzeChestplate"); + bronzeLeggings = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.LEGS); + registerItem(bronzeLeggings, "bronzeLeggings"); + bronzeBoots = new ItemTRArmour(Reference.BRONZE_ARMOUR, EntityEquipmentSlot.FEET); + registerItem(bronzeBoots, "bronzeBoots"); - rubySword = new ItemTRSword(Reference.RUBY); - registerItem(rubySword, "rubySword"); - rubyPickaxe = new ItemTRPickaxe(Reference.RUBY); - registerItem(rubyPickaxe, "rubyPickaxe"); - rubySpade = new ItemTRSpade(Reference.RUBY); - registerItem(rubySpade, "rubySpade"); - rubyAxe = new ItemTRAxe(Reference.RUBY); - registerItem(rubyAxe, "rubyAxe"); - rubyHoe = new ItemTRHoe(Reference.RUBY); - registerItem(rubyHoe, "rubyHoe"); + rubySword = new ItemTRSword(Reference.RUBY); + registerItem(rubySword, "rubySword"); + rubyPickaxe = new ItemTRPickaxe(Reference.RUBY); + registerItem(rubyPickaxe, "rubyPickaxe"); + rubySpade = new ItemTRSpade(Reference.RUBY); + registerItem(rubySpade, "rubySpade"); + rubyAxe = new ItemTRAxe(Reference.RUBY); + registerItem(rubyAxe, "rubyAxe"); + rubyHoe = new ItemTRHoe(Reference.RUBY); + registerItem(rubyHoe, "rubyHoe"); - rubyHelmet = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.HEAD); - registerItem(rubyHelmet, "rubyHelmet"); - rubyChestplate = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.CHEST); - registerItem(rubyChestplate, "rubyChestplate"); - rubyLeggings = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.LEGS); - registerItem(rubyLeggings, "rubyLeggings"); - rubyBoots = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.FEET); - registerItem(rubyBoots, "rubyBoots"); + rubyHelmet = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.HEAD); + registerItem(rubyHelmet, "rubyHelmet"); + rubyChestplate = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.CHEST); + registerItem(rubyChestplate, "rubyChestplate"); + rubyLeggings = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.LEGS); + registerItem(rubyLeggings, "rubyLeggings"); + rubyBoots = new ItemTRArmour(Reference.RUBY_ARMOUR, EntityEquipmentSlot.FEET); + registerItem(rubyBoots, "rubyBoots"); - sapphireSword = new ItemTRSword(Reference.SAPPHIRE); - registerItem(sapphireSword, "sapphireSword"); - sapphirePickaxe = new ItemTRPickaxe(Reference.SAPPHIRE); - registerItem(sapphirePickaxe, "sapphirePickaxe"); - sapphireSpade = new ItemTRSpade(Reference.SAPPHIRE); - registerItem(sapphireSpade, "sapphireSpade"); - sapphireAxe = new ItemTRAxe(Reference.SAPPHIRE); - registerItem(sapphireAxe, "sapphireAxe"); - sapphireHoe = new ItemTRHoe(Reference.SAPPHIRE); - registerItem(sapphireHoe, "sapphireHoe"); + sapphireSword = new ItemTRSword(Reference.SAPPHIRE); + registerItem(sapphireSword, "sapphireSword"); + sapphirePickaxe = new ItemTRPickaxe(Reference.SAPPHIRE); + registerItem(sapphirePickaxe, "sapphirePickaxe"); + sapphireSpade = new ItemTRSpade(Reference.SAPPHIRE); + registerItem(sapphireSpade, "sapphireSpade"); + sapphireAxe = new ItemTRAxe(Reference.SAPPHIRE); + registerItem(sapphireAxe, "sapphireAxe"); + sapphireHoe = new ItemTRHoe(Reference.SAPPHIRE); + registerItem(sapphireHoe, "sapphireHoe"); - sapphireHelmet = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.HEAD); - registerItem(sapphireHelmet, "sapphireHelmet"); - sapphireChestplate = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.CHEST); - registerItem(sapphireChestplate, "sapphireChestplate"); - sapphireLeggings = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.LEGS); - registerItem(sapphireLeggings, "sapphireLeggings"); - sapphireBoots = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.FEET); - registerItem(sapphireBoots, "sapphireBoots"); + sapphireHelmet = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.HEAD); + registerItem(sapphireHelmet, "sapphireHelmet"); + sapphireChestplate = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.CHEST); + registerItem(sapphireChestplate, "sapphireChestplate"); + sapphireLeggings = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.LEGS); + registerItem(sapphireLeggings, "sapphireLeggings"); + sapphireBoots = new ItemTRArmour(Reference.SAPPHIRE_ARMOUR, EntityEquipmentSlot.FEET); + registerItem(sapphireBoots, "sapphireBoots"); - peridotSword = new ItemTRSword(Reference.PERIDOT); - registerItem(peridotSword, "peridotSword"); - peridotPickaxe = new ItemTRPickaxe(Reference.PERIDOT); - registerItem(peridotPickaxe, "peridotPickaxe"); - peridotSpade = new ItemTRSpade(Reference.PERIDOT); - registerItem(peridotSpade, "peridotSpade"); - peridotAxe = new ItemTRAxe(Reference.PERIDOT); - registerItem(peridotAxe, "peridotAxe"); - peridotHoe = new ItemTRHoe(Reference.PERIDOT); - registerItem(peridotHoe, "peridotHoe"); + peridotSword = new ItemTRSword(Reference.PERIDOT); + registerItem(peridotSword, "peridotSword"); + peridotPickaxe = new ItemTRPickaxe(Reference.PERIDOT); + registerItem(peridotPickaxe, "peridotPickaxe"); + peridotSpade = new ItemTRSpade(Reference.PERIDOT); + registerItem(peridotSpade, "peridotSpade"); + peridotAxe = new ItemTRAxe(Reference.PERIDOT); + registerItem(peridotAxe, "peridotAxe"); + peridotHoe = new ItemTRHoe(Reference.PERIDOT); + registerItem(peridotHoe, "peridotHoe"); + + peridotHelmet = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.HEAD); + registerItem(peridotHelmet, "peridotHelmet"); + peridotChestplate = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.CHEST); + registerItem(peridotChestplate, "peridotChestplate"); + peridotLeggings = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.LEGS); + registerItem(peridotLeggings, "peridotLeggings"); + peridotBoots = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET); + registerItem(peridotBoots, "peridotBoots"); + } - peridotHelmet = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.HEAD); - registerItem(peridotHelmet, "peridotHelmet"); - peridotChestplate = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.CHEST); - registerItem(peridotChestplate, "peridotChestplate"); - peridotLeggings = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.LEGS); - registerItem(peridotLeggings, "peridotLeggings"); - peridotBoots = new ItemTRArmour(Reference.PERIDOT_ARMOUR, EntityEquipmentSlot.FEET); - registerItem(peridotBoots, "peridotBoots"); wrench = new ItemWrench(); registerItem(wrench, "wrench"); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 3d7207c83..289650100 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -495,28 +495,30 @@ public class ModRecipes CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFence, 6), " ", "RRR", "RRR", 'R', ItemIngots.getIngotByName("refinedIron")); - addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe), - new ItemStack(ModItems.rubyAxe), new ItemStack(ModItems.rubyHoe), new ItemStack(ModItems.rubySpade), - new ItemStack(ModItems.rubyHelmet), new ItemStack(ModItems.rubyChestplate), - new ItemStack(ModItems.rubyLeggings), new ItemStack(ModItems.rubyBoots), "gemRuby"); + if(ConfigTechReborn.enableGemArmorAndTools){ + addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe), + new ItemStack(ModItems.rubyAxe), new ItemStack(ModItems.rubyHoe), new ItemStack(ModItems.rubySpade), + new ItemStack(ModItems.rubyHelmet), new ItemStack(ModItems.rubyChestplate), + new ItemStack(ModItems.rubyLeggings), new ItemStack(ModItems.rubyBoots), "gemRuby"); - addGemToolRecipes(new ItemStack(ModItems.sapphireSword), new ItemStack(ModItems.sapphirePickaxe), - new ItemStack(ModItems.sapphireAxe), new ItemStack(ModItems.sapphireHoe), - new ItemStack(ModItems.sapphireSpade), new ItemStack(ModItems.sapphireHelmet), - new ItemStack(ModItems.sapphireChestplate), new ItemStack(ModItems.sapphireLeggings), - new ItemStack(ModItems.sapphireBoots), "gemSapphire"); + addGemToolRecipes(new ItemStack(ModItems.sapphireSword), new ItemStack(ModItems.sapphirePickaxe), + new ItemStack(ModItems.sapphireAxe), new ItemStack(ModItems.sapphireHoe), + new ItemStack(ModItems.sapphireSpade), new ItemStack(ModItems.sapphireHelmet), + new ItemStack(ModItems.sapphireChestplate), new ItemStack(ModItems.sapphireLeggings), + new ItemStack(ModItems.sapphireBoots), "gemSapphire"); - addGemToolRecipes(new ItemStack(ModItems.peridotSword), new ItemStack(ModItems.peridotPickaxe), - new ItemStack(ModItems.peridotAxe), new ItemStack(ModItems.peridotHoe), - new ItemStack(ModItems.peridotSpade), new ItemStack(ModItems.peridotHelmet), - new ItemStack(ModItems.peridotChestplate), new ItemStack(ModItems.peridotLeggings), - new ItemStack(ModItems.peridotBoots), "gemPeridot"); + addGemToolRecipes(new ItemStack(ModItems.peridotSword), new ItemStack(ModItems.peridotPickaxe), + new ItemStack(ModItems.peridotAxe), new ItemStack(ModItems.peridotHoe), + new ItemStack(ModItems.peridotSpade), new ItemStack(ModItems.peridotHelmet), + new ItemStack(ModItems.peridotChestplate), new ItemStack(ModItems.peridotLeggings), + new ItemStack(ModItems.peridotBoots), "gemPeridot"); - addGemToolRecipes(new ItemStack(ModItems.bronzeSword), new ItemStack(ModItems.bronzePickaxe), - new ItemStack(ModItems.bronzeAxe), new ItemStack(ModItems.bronzeHoe), - new ItemStack(ModItems.bronzeSpade), new ItemStack(ModItems.bronzeHelmet), - new ItemStack(ModItems.bronzeChestplate), new ItemStack(ModItems.bronzeLeggings), - new ItemStack(ModItems.bronzeBoots), "ingotBronze"); + addGemToolRecipes(new ItemStack(ModItems.bronzeSword), new ItemStack(ModItems.bronzePickaxe), + new ItemStack(ModItems.bronzeAxe), new ItemStack(ModItems.bronzeHoe), + new ItemStack(ModItems.bronzeSpade), new ItemStack(ModItems.bronzeHelmet), + new ItemStack(ModItems.bronzeChestplate), new ItemStack(ModItems.bronzeLeggings), + new ItemStack(ModItems.bronzeBoots), "ingotBronze"); + } CraftingHelper .addShapedOreRecipe(new ItemStack(ModItems.ironChainsaw), " SS", "SCS", "BS ", 'S', "ingotSteel", 'B',