From 339387c460184f3676dafe82a634f212391c70bd Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 4 Jan 2024 15:22:27 +0700 Subject: [PATCH] remove copper coils --- .gitignore | 4 ++-- config/exposure-common.toml | 1 + config/{terrafirmagreg.json => tfg.json} | 0 .../textures/block/copper_coil_block.png | Bin 6504 -> 0 bytes .../textures/block/copper_coil_block.png.mcmeta | 5 ----- .../textures/block/copper_coil_block_bloom.png | Bin 2765 -> 0 bytes .../block/copper_coil_block_bloom.png.mcmeta | 6 ------ .../block/copper_coil_block_bloom_ctm.png | Bin 3422 -> 0 bytes .../textures/block/copper_coil_block_ctm.png | Bin 8063 -> 0 bytes kubejs/server_scripts/gregtech/recipes.js | 8 -------- kubejs/startup_scripts/gtceu/blocks.js | 13 +------------ kubejs/startup_scripts/gtceu/machines.js | 2 +- 12 files changed, 5 insertions(+), 34 deletions(-) rename config/{terrafirmagreg.json => tfg.json} (100%) delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png delete mode 100644 kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png diff --git a/.gitignore b/.gitignore index 38c9735d9..43a31fe38 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ XaeroWorldMap/* CustomSkinLoader/* screenshots/* shaderpacks/* +chiselsandbits/* # Extensions **/*.log @@ -62,5 +63,4 @@ knownkeys.txt .github/buildtools/serverpack/banned-ips.json .github/buildtools/serverpack/banned-players.json .github/buildtools/serverpack/ops.json -.github/buildtools/serverpack/whitelist.json - +.github/buildtools/serverpack/whitelist.json \ No newline at end of file diff --git a/config/exposure-common.toml b/config/exposure-common.toml index 47b44b60e..f619bc6de 100644 --- a/config/exposure-common.toml +++ b/config/exposure-common.toml @@ -3,6 +3,7 @@ #Default focal range of the camera (with built in lens). Default: 18-55 DefaultFocalRange = "18-55" #Focal Range per lens. Item ID and min-max (or single number for primes) focal lengths. Separated by a comma. Allowed range: 10-300 + #Note: to attach the custom lens to the camera - it needs to be added to '#exposure:lenses' item tag. #Default: ["minecraft:spyglass,55-200"] LensFocalRanges = ["minecraft:spyglass,55-200"] diff --git a/config/terrafirmagreg.json b/config/tfg.json similarity index 100% rename from config/terrafirmagreg.json rename to config/tfg.json diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png deleted file mode 100644 index e4edb9e4bfea95af0134c4c8f941830747830a87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6504 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 diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta deleted file mode 100644 index fc2ebfe89..000000000 --- a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ldlib": { - "connection": "terrafirmagreg:block/copper_coil_block_ctm" - } -} diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png deleted file mode 100644 index 07177b3177f9cca84da69d6f997244f3dc690cf4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2765 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0X7ltGxWVyS%@ z0|R?dW=KRygs+cPa(=E}VoH8es$NBI0Rsrw*jE%JCTFLXC?ut(XXe=|z2CiGNg*@E zRw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+asv@@_H?<^Dp&~aYuh^=>Rtapb zRbH_bNLXJ<0j#7X+g8aDWT8TYZ-9bxeo?A|nVx}evVnoAg1M!hp_z%PrGbuuk%5tc zzM+x6fu*jYp_Qq*m5GT06e!s#*c7FtSp~VcLG3C^NwZbTC@Cqh($_C9FV`zK*2^zS z*Eh7ZwA42+(l;{FElNq#Ew0QfNvzP#D^`Y?;F4OLT$EW*l9`{U05UN#DZjMDR!IqJ zY(;K?uP@x-ykclTCFkerS0onb8|oS8=jMX^1@>@piECL2e$~Yxl?AE#L8-<0rA5i9 zu4SotCCV_%+&z5*;JQJcNYBhI0DGe%w*YQQN-|tcL1|GASUx3LKQ$*cH#M)MSl>|3 z5U#c&w*amftK(r-mt>|P!Vg6yNCxarn9_ob{F40QjC>p>!=>Sx3VeO7T=J7kLC*7Z zfu)I*{N&6OE4XSaqtqnRB#Wd(-BbfZ1Kp$)6H8r7qr^mA3)2*f6k{_}lN7ULkP|?r zdFBt<#Z+=Q5Dl6eXx&az7rOGxJjN%ZuSYL<(DwXY@gZDkNU?(W4BJ z3}6}2F)uk46rsh?U~o!Ihq7`q?LeiW6{OezGt&$$EzMJnlXZ;^6HRnYQp^l=6AjD_ zb&V1ejf|2_Oic_e&1}H-=VaO`Kv)n1_3_&b)`L_rz%&QBxPh49It)~w*(o3@%GA6R zTcsi;d%NA=MPeBkm=!%;978O6mrnNfk4a^4IRCx&`?=aPrxO_x*);teqmFRp`mQQn z*n6yHf?6;4;!eZF)JKP=a{q7Ge_-oHiMOjRwq9J(sV(1|>8i<@psn;&(ZJx`=X=)Q z>+Y8>{Ks_u*BZZ~BgLj4IU3dmY;$6IbxxioFXjRnHZj2l#f8aRZL7&Ha6o^!mv$vLkwbK24UO25M8 zo)xM3e_gvg!iuvaZeHreX({(Bn!=~3{Jte~eaeyg=Un-98xEz5O*q$YRJ!uinZW7C z4v9>^_kX57n+?};?;cyrV>!x8g3lU%`C{>Won2g2-J%;3nw3v-TesM7SHIj-J9TGx zdYt|q^EYSWW>;E&KbesC>C?^Nqwn4RTzt8a)ojJptp1l<&(8MIol~{tcVP6{eHN4V z)*asH)8*jRS+wNwFS(U!&#f!jmKWC*|91Rz)#>e;>c+;CPLea6Mg*TS3-n)0-AK^gn;`gU@7cJYU>UB$~)sRhgrp6mq z4%g-4TUX|nRDJ!;zNI{RcJ}@|Y4tnnWG*b)D*bB1<;Oqr%zZqrFwZ-&>(q~hWPdEPlku$%$W8wB_8K2wMPp|I%aQ)xGTL;^AkfV% zYPe2CME1}BQ*N`CtnXahqVoQMC71Rkm3ghP-#%P_^~Z9~(hFT3AzKx?Iu9OsHh*eA z^R6HTA!n&0M;bD|cOGh~6A->$UBW1sC8YTvf5y9%n|DPS4uTq-p00i_>zopr0KEkI A%>V!Z diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta deleted file mode 100644 index df6100a46..000000000 --- a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ldlib": { - "connection": "terrafirmagreg:block/copper_coil_block_bloom_ctm", - "emissive": true - } -} \ No newline at end of file diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png deleted file mode 100644 index b58e4f54aace10a2afb128ea5083b3e3b9eec9d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3422 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 diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png deleted file mode 100644 index 74e65ef6e4697af383bf407422521c6e2c12a7a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8063 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANM^d{rS4B|(Yh3I#>^X_+~x z3MG{VsS2qTnQ06R6}Q&Th@7Ns$>;LFvdfamyugxgN6XDS34QkbJrlHyvtO=yH%&+N zs9V!JKK2=T|KIPQ{+oZjNLF!VmiAte^V;9n*QFENPkb^UTHTQC9n-zwB&!zR6*|-4GS*p&AglmE6Zso|b)D0<+T%VUM5=h8j+O#?hRTyD+pyt4n` zpN_NUJ$0Xc%}up6vNWpL{7vq6x81${`%Wx=Rcv?n`F`Gzd-vyO)XwGq^t7hRU)bLD z%D%HQ_HJ7yU-!@cci>g&+OpW+ciwDzc4*e=%`2`4ozu^gX}ear=EJ%_ocmu_mf!2m zRJ#;;&fh4j;DU3@ChaF1n%cDAe6~HTazv(lP0ewO#JlHAcf2T6du((2cB^(+N4$r^ zvd%D}<&UkW6+C;JzDrVSSA3&&a>9lK!tb~LuK3`8?>=uy>@;J=AK#93?O2qmm?%;F z?PRQg&^q>DiBk4QAJ~39KHcGKpuzs^7}M4M>JG(+v$sw9m~&Hq&*uG`t*?CLVQ@L4 z%OWhq^FwG-i%?DP#x{mN-nuC#JP%kj%~tF<;yT4}d5A*0PD0+il@ISotKM5)=-)9R zB&b!&NO)6`*pp!6u-luxCg~`-t}=PKNLBRohM+7%>1(sH)&+U5-Fh`{>(Xhnw_M7~ zUTgk#qk6lqx4L}w>%FUuRvK;kw56#1Rflq~P0Ex&cj?*}E_TNLGgGhKOq;*!kyqZt z6RX$ky7kJt{Dw#7bKTu+Ft%GNogZJx65{_DC^vSV^VtYn`*$(ENmy`&~tC6``dPmf8}@1~bY# zidxOf@6Y(Hn6I~e|Iz3_r{);H`p5fhPT=>}o$o7uGiINDlP7n~Piz~XDl~kv|BORh zyNZgVm+IITOZP0+iPS%%b-irusxOMMa|(*C?nyqxS3P-c>e@+>n#OuL1zY3WKe;^m zr!Ymf{msqP-`-*`SJz%!wmWp4=r3h9&A^;I*_d84k?B@XX9mS=(QRC|mhte4R2Qd1 zW)2sGc{e5gSaJ5D;Ju{x(_c6^Rc@VgKI&NK$wiTI&jYd=PxbbA$gbJ#+i=r~vF~K# znT$E_xl9JWY#v+Z1tS;28IPy~ zT@hz)d5DU|J$G}qTxYdD@kPjmmun@h#Cs1i9>4oyOMSyR-oD??C9hT~U)Z1b#rT>d zdqJ3RP)hixt{;O3U6iKR5Mny23K$lrC@BVx_o?ek-a~wqLy7QNCm9 zmI#mb24~~Njz*r}LQ{j4?3xcd#QAYJK3kJ8<-E`7FFNTve>9w&b|TqCw#Y@wDI#q` z+*_x8d8<0U2J9`_^*SI_t^X5GOKM5~1Z^*d)q>^8AGoLJi4`q9QGR*r@rc~dE7tAY zbnaCNuX1*B6w~)pEO&!8W$w|Lo8uRw_HcsF8I4Ta6A?2MqTOyWJdSE_wad|+8@BkX zg!rsblT-1h4U{9iOjlpsF!Al}>}PGg)35Hh|8ds+jZ)va*DD%@MKR9K@8&tYrm&sy zcuPrS)dmX-;oiK>HPtgd^+p&zw|H>$$?2q1y6fvM9o=r-f9)iL)DCeio8FC)8nykL zj@d^I56gLF3Uv8;oQ@auO5kiw7qaD@_AT(hS^HO|^(yz{SBOhb{O4CD?86p$#3|h8 z;er2OqUuijutaWCow&9pTC2Cl+I1t>vy84I29l8n+e4F0uJ$Z5aQmoyJadxyQLfnQ zlfP$0`5vudW8Zz_u4R^}{W4!(1^tv$WO$Z9ofsWj z;?8b}v8vf>v@BJ*e#Zw5PMfI=_A~AZemej6+}|S~{#|;nai@CC>Ymt@pJHPpDxc33 zH16n;Xy3Y`@XMa%89yQfGxpU7^4>e158(lPaHA(NN!gk|5EZ*CBjJ~>-4s`||KfI4;EI;oT8uH3v?XAC_r z%sN!m(6%)x`N@;FqOUV%JUo^A{Oq2o$-FzaOXyoT=d(3EH9Ma4_3qqD;^&UFERj$- zIAfnpm=oV*gBwjRoAM^LER6PQl7D~MF3?Y^ckPxpRSA1@15HvMEp4=$Evx6N##kPC zgRkMTzi@=jU)Spo%@0S$_j>G|C%G&5_VT37GpZ)Js;9eLoTSXga9DSW9N+WKjD};o z)rwxsJwG|<%aYB%EA9SATJ4_yyts>nFKUK|!Ny4pOJrW#pJ++ntFx^szC>*L+P-3& zi4h#L(v~+c9x?D(+xSO-EBap>i$ToZGe;X|FKtp=z0`a8x~U3=m*b8F|H)nMz-8pN zDIjj!{J-(00q^v!SKQB8aObXL<0exETfXybSs^=aPh0=0m-~EL$3bDIWe)}TXg8mnki-ssnN!s9&f*> z`DZ7k_U!fBBC|!-X~nW;M(c^HA8YQEHNHK!_mAnzeuw_A@#TlT;~lQ^d9;`tFS`Hi zu?aiN$p<$k+lz5E9F*eSoBn;d{iiqVN8cRc+Ici}cRjZQ4;%A=tcgDxuHKpcFxct( zYL(A#TyDNu#BpMmc=lSIi~fF3GcAjp1hhZBDWCP!)%MtdPrMgwa%=Baxuh?DzOv?- zlu2jRnYz=DPb|L?y(!>RdbN4y@50`U*a=^i*Uh~uJv(E^hnvd<%a%8mE<7$=(_T}* zX>*jH$*WCsZ!L@Tt}r{Ea_G%9%U0Fnj^Dq$@tCaHuREk4^BgVraN>XOB_?&*rUJ zk%eLNH`JVwV=<5sl2z_pkgA>7ur+^1MkPN>!lAOiJ3O3qBo=a(&y;PbOZbx&;Qj8| zX)afjzLOkg%qH)joHBX7Mk_>cLcrEHX30OKAK2X3ai8(H)%6N9;m%`M|K&REo}=+a zQBgPh(aj$d^{)73Y+s?27_lu#n_DX@L9#XJzy!|4Y+gn4{HEPF>&7VgaPp;;C5tQa zz8*cM-tH53E#SeAYXN5@FaKJ%;@^g4yY>f$*k23bdY*ZH@$ZiB{A$l0@=7hS#n#0O;vK0a7zfA4Pf zoxRL|&PoNJomc2^RY!TYALq|QT>@3E0){RVjx0FhQyV5?{6QxE`-hKT^$u>{bN;X8 zuc?bpGR$|dIb3pBDNfxlFUsn9?IVrV9$X(SKhAIzSE+ll>&++W=bH}K&66}Ox@q}H zV`IR(q@CT7M*}*ScRcP|6}Zp-{iZ{e-J7FUZ~kWcll!o1Ze{0dllF%SxZlHnrqHsYSQ2K*N~~D ztTF8Hw*CFNyGxl^<~3@seSANI>GJ#~=2lUEI3#Yc>8-P#wTC_C9fPy~t`v_xkp(aH zr#5^y{lpi<;HsXMd|v6mX?*7iAWdWaj57fXqxx$}cUkRZ`+oP*8vxUXfei>kBtNuNWE%$@#hZ6^RADNa0?140nYjgEPgUd= zpjeiY3|CiBT9gA;laj2TnvVR8qP`?E4G~x?(uG($^E^Hk$xU1P&U6J3)OGXvd319L-N zqr^lbqhu3P6GKZgB%?g@ic1pnl2buORpb`vWoD*WnOGVbr6wh&=q4K*80eaqo0#fa zm|G_6ni(3UC8b#yrDv(hrnJHH0=7y%0rfJ5yi3TR-x+W%u zmb#XSMrOJx=E)YRNfwETmX;}Cqd@Usn-6rm_AwWv5VKM!Q4p@E)}30Nj2*~%@yC^xah zRw*+#F+EkkATJ#(0g4tY|Dw#)yplvvI<-|Y1dCVX7FanKr6!i-7lq{K=h!NN+^S%t zXJ`OU-U>F5Nb$%lF3B&dv;(JTaJ~snErjqOSs*79ETy0TPPSHw$q-A56U$N|VW0q$ zO3p~kOHWO)Re~lcn0O|Z$g(g@H8nIdx74*XNixhaQ+y&@eMC-QCy}#Y@wV8|*u!(* zpVeHJ64>gfC;f2GMxU4AZgtPC)&0Nx)33i17ZdmK&6_DV-|9|2IU{NN(;qjZ&*;^^n=B`+pps|MTVd{WmrLZ@&LeQ1P(@gXHlJ4W)|y zFrn)qTXb2{J%2g3OyN+SxN%u7^SLWqau-D8TR#`yEa~KNRKs5|XkwP@EqMV~rnz4) zS}o(%JzCVZ(!1&Nj3V~}zPVpH&Lz%XR($WO=%H((uQwgLCYqZ3@!Z7-Zw|R^-JtA{ zHGzenJ}i}z%x?PrJ)U{)XD2O}IcYtgrdXUkFi$08 zcwrlVQDjt9${NFSizoGHFfB~FwN16czd$aZH&7+O>Zs-R|1t&FKED54Fx`DQ??dnT z-kRUvGij!#H=T<-BA)+r?Zek|maVfE-m>oQea6?j&ogGf{m1u0=e5rUd#QKt4?K4& zRgiFU`1|L3eU-r{(RR9sZBP@T}o3zmhAl_c(5o{ zo(l=^b$~-w^ z#;Wh%r!mWXiIrNX>hZ&Js~08RIbC5T`Qhzn^$7V1P9J(ND}Q^d^z}`FOQ7_W54{j3dp~{!o_pT zBn{0IlV?nuR;Zt9^rrZdgj=PT{#Bp0+BhFxtM`WQQhC~v+m638q`_ zbrEh_K0PZV`jgB3^?s3lbJD(il9~H8z|-pk-%^p^?}VFd{XeYxY^N~AY07EKW0pCg zK_+a9Dz3Q-T^iEPALcF7+F0ruIBmwN1E!`GPMPYul{+KXWR^)!yDhY6#b>(<+ZeA}^cTuKXHHG- z?1&IGJ$<&%yjxds%bD$}N?kvmlpX#2QgHR6q%DyfS4#QG-Mf{_SMfYR{Ilu&vtcS; zpMIqsTr$1TFy8ot@V~m!_OMCe*Nc->Z-()1zB=plPd53eFxR8r&+YUbGoo9jgiKBU z60fQ;y?D}||0`G+9+hoP4wrm(ds1xfj~{1yZbf7zXRdjk7rbFL&+0{ws&+nI?4SSR z`BxcvrvE!;1zs&pXY!2|oV)+)B3G_YU+n*vK9{*>J?DFhmE+3lhmS1O-hbb*Z)f6- z*O#xDp0lj`y7+xzLD8{a&$lIF&L0zlXT`csGW;!R~!(AGB_i?Y%w%NRb0dLAU3hy6{RZrw-tY?fp WpBp<@Y<>u6G|to2&t;ucLK6VDtzfDE diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 723e5c8d0..b3d864a9a 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1006,14 +1006,6 @@ const registerGTCEURecipes = (event) => { E: '#forge:cables/single/copper' }).id('tfg:shaped/alternator') - // Медная катушка - event.recipes.gtceu.assembler('copper_coil') - .itemInputs('8x #forge:wires/double/copper', '8x #forge:foils/bronze') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 144)) - .itemOutputs('terrafirmagreg:copper_coil_block') - .duration(200) - .EUt(30) - // Compressed Coke Clay event.shaped('gtceu:compressed_coke_clay', [ 'AAA', diff --git a/kubejs/startup_scripts/gtceu/blocks.js b/kubejs/startup_scripts/gtceu/blocks.js index 35624b24d..d389a83f2 100644 --- a/kubejs/startup_scripts/gtceu/blocks.js +++ b/kubejs/startup_scripts/gtceu/blocks.js @@ -1,16 +1,5 @@ // priority: 0 const registerGTCEuBlocks = (event) => { - event.create('terrafirmagreg:copper_coil_block', 'gtceu:coil') - .temperature(1100) - .level(0) - .energyDiscount(1) - .tier(0) - .coilMaterial(GTMaterials.get('copper')) - .texture('terrafirmagreg:block/copper_coil_block') - .hardness(4) - .requiresTool(true) - .tagBlock('mineable/pickaxe') - .mapColor('metal') - .soundType('metal') + } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 1209e5558..0a415b613 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -32,7 +32,7 @@ const registerGTCEuMachines = (event) => { .aisle("CWC", "K#E", "CWC") .aisle("CWI", "CWA", "#W#") .where('A', Predicates.controller(Predicates.blocks(definition.get()))) - .where('W', Predicates.blocks('terrafirmagreg:copper_coil_block')) + .where('W', Predicates.blocks('gtceu:cupronickel_coil_block')) .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) .where('#', Predicates.any()) .where('K', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1))