From 5b794fd9298dc668951dfc5c51ba30c2df397a9d Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Fri, 6 Dec 2024 20:27:57 +0800
Subject: [PATCH 1/2] feat: anthracite & lignite deposits

---
 .../common/blocks/BlockResource1.java         |   4 +++-
 .../textures/blocks/resource/anthracite.png   | Bin 0 -> 2286 bytes
 .../textures/blocks/resource/coal.png         | Bin 1831 -> 2286 bytes
 .../textures/blocks/resource/lignite.png      | Bin 0 -> 2306 bytes
 .../susy/blockstates/resource_block_1.json    |  12 ++++++++++++
 .../resources/assets/susy/lang/en_us.lang     |   2 ++
 6 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/gregtech/textures/blocks/resource/anthracite.png
 create mode 100644 src/main/resources/assets/gregtech/textures/blocks/resource/lignite.png

diff --git a/src/main/java/supersymmetry/common/blocks/BlockResource1.java b/src/main/java/supersymmetry/common/blocks/BlockResource1.java
index 7f77cb5d1..b30564502 100644
--- a/src/main/java/supersymmetry/common/blocks/BlockResource1.java
+++ b/src/main/java/supersymmetry/common/blocks/BlockResource1.java
@@ -20,7 +20,9 @@ public BlockResource1() {
     }
 
     public enum ResourceBlockType implements IStringSerializable {
-        NATIVE_COPPER("native_copper", 1);
+        NATIVE_COPPER("native_copper", 1),
+        ANTHRACITE("anthracite", 0),
+        LIGNITE("lignite", 0);
 
         private final String name;
         private final int harvestLevel;
diff --git a/src/main/resources/assets/gregtech/textures/blocks/resource/anthracite.png b/src/main/resources/assets/gregtech/textures/blocks/resource/anthracite.png
new file mode 100644
index 0000000000000000000000000000000000000000..68145c11c4bb1423939ff311f90e21a7c5e401a6
GIT binary patch
literal 2286
zcmb_edrT8|96tzi%wa~IiEN8<9(#!Mdat(hPO1W}7GjZ9R9@5FtL3EamEK{2h++Og
zm~+$4WlrW`F;n6Um@K|<Dl;)M=Wxpck_l)w6HJCLhMDLh?suhabn_LnCfEDj?>^tp
z_x1Vxe)oPs{^BW<U!4p=(3D)e)d}v&+Lag&{<nn6P2l!|-(IXh(2Fl?R~*!|BL#vc
zHA;m=YLR0J!^>VhE6ALvulD)@8iFzxRQp-JLR4W+bW1)9a{b#*1eOE~veM|l9sV4#
zT(Z{&#AUVlg?w!VPYcL``EX`60|>mL%EHxNk56H$El8M`0b^|%L*Ot(t*{_jnnSqA
zQ2^)20THJ41j^$$31`rHE`v82cz!NS;-mq?Gcdx0;u(yQW(+tS`60kvKyWcm>!OG=
z@MJ;CRn^a6STGpW2PwTAaAO2b(-=--B#8n9s?_*Ywi@**X;B8NsPF;FuS&8H))-k%
zu2L-s2z4R{uRliXQzCT&6~n4oKSt<rEvGP0;A1#{RlpN=F7TM>5xt^MRRETVVL_Q3
zju`x*v|euvt*ExOAfiZa4@E15HGUCuii%tn;6>Y7;4v*4n7>?BWu;txL>{r%v26TI
zPC#T;IZ!Ceo@l2EqAW0J)YI_nm6A`8gG##QC1N02Syi+kTGvpVMscbT2Q8x*ihdh6
zGdMm0bpRm<tjgX8CP)-F6_PkZm>JUW09Y0zSIrZl0?)YQfR_bTlDw>2#QZ*Y*qg(_
z<oXnq_3>h^)q;Rf^^zno93k?AD9|WvW^t5a4JMSOITuP9IKgEmDHq8aqxM#ruhKdg
zwHJWBfEziMAO+N9HX2aYV4zT%<OMXtKoTyVbJ09uh}tg=NMH%Eo@eKYb%@E4J#xSy
z3!uuBrr)rR7`vo^X4OPi#4@omGV(}pSUL>LYwETjyw+AxKqAx9Ln`xhnN83J%SAx?
zn08OV6xpQ)*?^ek2335boUlg)udr($AG#rfqBsiYQI}Z|Q6p!-QCct<(F}p*OfKHY
zab_UF|AZbB9}ugNjEe8+LO1D&`&Yt*5ns;w+#=X3G342kc{+tYI++Jn(*KtXrtOdu
z3d8;_zVN&Ic2m&E@D$jhwPEaV01vU_Mf8C>1;F7kzOfmcSMf=?)~v$WA>+r6ef^7)
zY;=w@?L*IkethFJbc^l0cl=)J4~R56^~{~$lTM$`{=O+#`BO(y%lO^0{fA$HZc0Um
zo`aw-r{(VHym0NCtHTFjU0PR4<<T-n??4=+3l-#zoXc<B`gQy8n%(wk+2+o{cxd-;
zSK79(K;9HW$Kp28A2c=*p(b7E^Q-;NjRjrnI?DF0XxmldNRNZ2ZtLr*%Iz+xNa54p
zX!yDHz4lv+6Gx0oyN{**dG*fN_`N=<cF|WO>LjR5><_xG{XOfY)*F{Ewm|itrSCk_
zQQXoXHJ{oMx6rzN^`6uQZ|TmaSvuRC1BZ*3-@U!=`TD*JM%5{OyPUSayu~Z?(mS>{
zK+xh#jR{cB%x=pmd+1=5)OKLft^OGuuZ@r0m~I=m)jiO)<D$Or`1KQ|i6;hodj@p6
zQ1iaG2Cr?dxl?J++}t|ft*cyKMfE0UTNCP&FC9JW%PTpPHMILe*}=M1m)nPzEbrED
zJCxIN#5-g3_ITq^vvcw+XklCLAfGr)rb=yM>2zppY^3F*tykuC6sOxN=%V1Sd7(z3
z>yrZwDWS1WdG(q$sJ`y_{&Vez=CK1dIKg!)MLCQ7QnIyf-ui@WoQkhc-mv#mCo^>J
zeB2zw{yOr`HfLT<X54p2e(WJA<&Wp(RTXua^XHD<9KAg=#BJiwo*X1QttU(Qq19L7
VB{{V(>kI9RB-fU2ZO?vp!$0psBCP-b

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/gregtech/textures/blocks/resource/coal.png b/src/main/resources/assets/gregtech/textures/blocks/resource/coal.png
index afb49ad66c4f95b3bbb913b9ada2981610e06a63..9ffd7deb87021645bdea7f25535b433a0b44b2f8 100644
GIT binary patch
delta 957
zcmZ3^_fBwv1ruAxM5`GxN#@CBCdtV<3PuJ-Ci({E`i5q@2If|#mR2SP8{b`J<TEtV
zH82Y?GO#i-vNE)se33~OUFZ*!rE;Q?X_AFmif)>bk-4s^iAl0<Vv?n$u8C!;rKwq3
zs*!O@;^qkEYDS5olr*cHOoieS*Rm3;#N?99{5)Hw;>5Da1}t)}mT3kli3TP~x+y8<
z$+{_KCWg96$wtY#X^BQ@NydqZNoEEXN>IJ!8L2>>AXn?cooHZeWoR;aGK-##nVzA7
zMtEjkN`85<CQM6mMq*xiYKpCrzLLJ3f(;(0$U76^A(*k)TmlNL$&*<0<q0@s@;R2c
z`pK^Qf*BZ?csyMkLo_C;2AwXtZNS6A(KIDx<;2+*FSi)`{`-Hps3_ZV>QA)`&Fgko
z-w^-z>!)*Q_S#jqqLS0z|NUDhe)0SF`&+NQ{(37adRpo{@rilS*?Y@fOpZll3w{jP
zzi)5eZL#E>wQFBn`7Vzs(rrC<@OsqzYgaAVR~fq1zyJHRsMGM61ml9O@8$$g{k=^x
zx#MPCecd_Dr4pSl9zRxIdL=4*t>tsR`7XyKg0p)KC#r6mmbJFSqUZ6p+@(|Q?Oye4
zPO;vx1zXLY$9S2tz5Mh^CRt?S6reRT85dlO@(R3q`n9%TtAN18>h!g$*_|`JHP6`i
zUfxtA-4^KLrCEPWBJG@|@n%Cd!Oo5wleU)09IuT0R{vkF|M<T59T{t7+a8w8s(!EZ
z>D#wut8SNVS6a2|^e5e=91LgP%u!Zi@X)-QSI?L*YuWkp{tN|uK-*)yZhqhUz3xqc
z-F(5q``@EpPn_4WW~-*EpknsQt<UzZ-)gkEqeURdi~a6yi{~>e>suHYKHJ<5T2&mA
zEh?yV%2N5!%MzxB&p)ekO_zswNgfwunDhObM9legh7+2t0&|L&SI#>Y=ps;fJ8xCh
ztmj`}zO35&Z)e=wO*)oKAG6-8PD?wz{q|c2K6}HK<NN$CvoNSA9e&WS+;dqZndQRz
z_4<Mz?^!?ZWA)bj{m;S0YQ4YCs;-W6I|ZEH&z*U_R8-JXE8JE{Nr~YP`_AXpEG$Lg
QoD4wV>FVdQ&MBb@0K|oeOaK4?

delta 607
zcmV-l0-*iw5vLB2I06Ljkvf<hVK!klGdVUaATlsAG%qkSFEKJLFgH3hI65*jvF_CY
z4lp?_FgR2)Fgi3dIx#qt(E=R~FgYzSI8-t)Iy5snF*uX_0y&dU1SPXt19<_HZ3bC?
zc#~?20005sNkl<ZD3N`VOLF8O5Jam`f%pV!wH&>1_zu4RnH>IvrA8{CU>3}BVos2m
z?<Ky!zcVu;)>=hGYu$S%qLk9(@%Z`qx!rClC9U;!T>zkzQbbg1O(_9Dt(BSgeJ`ba
zety2Zyda|YKE{ZMM5Lb2r-=04l~S#LH2?qr5n<-zI9hAZ=X0KCW{xqIQYP=cbFP$f
zo@Z;#IXBO<h%Czj0M=S&&N(yld7e4vY1_7(^L1S@#@@Tu8UUDCDK*dY$h_b0M6~a_
zh$uuXr2s%FWnI@%jG09wgg`_@)O-K<_^7q^-qrnne|viiA=FxpG1l5KecQHwX_{)S
z%d#-Db53hLO_Lgn5m71i{rxQ>F~((C5b-?E+wFE;*Kr)Z_ZXx1UKwMK<0z$QtxGAt
zzrRYU*Vk7fT9#$ts<q~vbIw}pY1=mM{jh<E`@VbcQ%cUc*4o$CSI!v`0pKqs=iHDG
zLh#=2`##_h(MT2%02p$KXj<2PwfCM<Dy4)Fj4>jzt}7xkb88I|jWNCV-g|3}28wlE
znb{aKzz@w@Ya#-G*4k*{oKx0XM6}k9oZ~nUF{PxG(pnFC0ML6k#?)FTYpsanoF9+J
tFdafT&vPgnLQ_gZUnxcX=V$-?<sWDze#R$>H&p-t002ovPDHLkV1hBS7`^}i

diff --git a/src/main/resources/assets/gregtech/textures/blocks/resource/lignite.png b/src/main/resources/assets/gregtech/textures/blocks/resource/lignite.png
new file mode 100644
index 0000000000000000000000000000000000000000..82172dc2c6f2db5c2284132469e9123a0daf5e61
GIT binary patch
literal 2306
zcmb_ee@qis96vBor#MA0bN(3TIig0c_oFTCofKs)1LlfYL9y!M_3o9P{c+{)paq99
z8U~^p)J&GSqK<4c@z=6HW@J+|k<eu_rXt4a5Hrn)y3H(3nR5%fmbS9ZU)k2=dhgzS
zzCS;o_ug$OD$JWOZrV5qf+iH?n=HzGQurF1sQfnt9GS}P8E^hd34+F_gs%i>XK*S6
zjjrd5OXX7Yt28UPRSYNCfXeUoDrgAGTIlyOtP{wv4V3X719I#0;|R=i24scSjGMhi
z;NbJCMX;>8u$ZlOvJ{6b%!af4wBo=GWCr%TT^@<{8<2=!S{a9@F$9i4WTyei2?vBr
z%|)<L5CKf72$aQf64p^Fn~u%YuxtiQ;-m({br_L};yPMO(Hb0%{tzXc$k}O&>E&oJ
z<;j3JWZ6q&n9t`^`P3>wEW-$jqA;AqND@^Ls8r>V89(ZgX2(33fW(TtSLOu|9QMfA
zgbLY!D5(zD;P%GddZcKdl#XG3#)}auJX})*$gy#pw?cG9f^#eeT)+)HvZP>%I96$s
z*&K&I)UDecM@w>UrIJy!wuhpn;wmq|EI<+}L>A;$DiLSL67xC)S&$sUBkG91j#uNQ
zjUr%VK`a&oSB$Bmm=~DTswjBw3f{vBK51S!O4I<D7#SFlFl#7Ip}4vjS141{YHB{N
zr*V83YF326F)}j(Opqv^Sxn+Ip{I$zf(4GZS3MERv9w(f-Hg&D-p!N&%<CzOL^GS|
z0*@p!9u^ds42Y7disw0+(q`g124_*58fZ`rr_rM}PNzlz(BW#vZqsq3I%aPY*orWN
zF?&w2=Wwl!AxI9*)N3^;qtU2Qiex!dry&VDYqL`<p^4cq5qV_^F|L2_C(aOU6kLL6
z7C5EL>aczzI->J=Ng=B$x+0c=^61FL!x8Dw3>#Lr0b#?m0uG5z^AG9F(^WR?*5?3<
z)5p*~43h-A>|;cbQ>JwBiE_domAu4MK0b9yp@1ZH49c)}8;WZ*9LfN_4#hc+U>KGm
zbp#VDeMIUH#HXQgGN#n0OFdIXj9dxBMy!MJlmTV0#E}0`%u^}!A3QuLX5>ox|BAuF
zJLIs!u)m8h@@~X#st_5OQnu*uFn%~F5Aov#c$7Yg%Hi=#Uf=T&ln57?a*F2$(odh-
z-h)qCbf(#gF0Py$n$?xmxT&>4J2aGAlxoZmURb^u)oxwc-)s0jH28Jb>Q$pQW_R8f
z$3ReN+mDGYg(-8|F<;%aV|mV>Pv5sJ-d~cF++tjP<lN|<cFfWY0@maftv&eGXvjFQ
zZga-P!0cAkz0W(<_FYHo%;c?dcklW073Qu(gPNHkq?Q^88lOwtIOnr2XaCB;+0+bc
zx9h<5t5+_!Ea|*()4ja+{l=^E@As?kNiE4=`SlPaT|WHg7ZZ)!{#e^yGd1DFg2wKW
zz(s4?)tl}Y>c&D_dRA4KYLXhkCmA=IW-RS)JKX%ry_&X!6X3P}BS&w~lDm$kx1-bB
zgLe;Vi%LoY$hh;<pbMdAQ=x5x8~P4^v}4B1i3?t=+nwFsbP}u*Ys>2guIoGY?CV_Q
zG@I5<sk;_jf9&$Nb%UWxcYb@rPyfIsz1x<55V7nhI<4ccY$Jw#YP3$-Tl4yYQ@NY-
z+;o4L^T4?;kx=<9L&Aye`s(WJCBJ(5Q<ge+en>epTF;674V!lD4N!YK>hE59=i_<l
zfg9_b!K(QU4rpy(^N#7Q^IE&wQi)D~>+a(lnh|K@tfCS>mDciUW5?J@S;-gIq)ndF
zdpF;bo)SoCvd(}?M<M9I+4YtZHp%*)p8B9x>i_0+ZJ%ch)EGK>XIK5|q%{XE4OxbT
t=wRs9sR?KH^p@AJ84zv<_53nqDD7>T>8WaiYQtYC1-XT$Locn}^e6P=D8m2%

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/susy/blockstates/resource_block_1.json b/src/main/resources/assets/susy/blockstates/resource_block_1.json
index 9b33bbb08..a8a4a4a72 100644
--- a/src/main/resources/assets/susy/blockstates/resource_block_1.json
+++ b/src/main/resources/assets/susy/blockstates/resource_block_1.json
@@ -14,6 +14,18 @@
       "textures" : {
         "all" : "gregtech:blocks/resource/native_copper"
       }
+    },
+    "variant=anthracite" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/resource/anthracite"
+      }
+    },
+    "variant=lignite" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/resource/lignite"
+      }
     }
   }
 }
diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang
index 65f7f7282..116aa98ad 100644
--- a/src/main/resources/assets/susy/lang/en_us.lang
+++ b/src/main/resources/assets/susy/lang/en_us.lang
@@ -76,6 +76,8 @@ tile.resource_block.potash.name=Potash Deposit
 tile.resource_block.sulfur.name=Sulfur Deposit
 tile.resource_block.coal.name=Coal Deposit
 tile.resource_block_1.native_copper.name=Native Copper Deposit
+tile.resource_block_1.anthracite.name=Anthracite Deposit
+tile.resource_block_1.lignite.name=Lignite Deposit
 
 
 tile.multiblock_tank.clarifier.name=Clarifier Vat

From db2b8389db66a21707ea89303cfdabcc753c700a Mon Sep 17 00:00:00 2001
From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com>
Date: Fri, 6 Dec 2024 20:53:25 +0800
Subject: [PATCH 2/2] chore: brighter lignite

---
 .../textures/blocks/resource/lignite.png      | Bin 2306 -> 2348 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/assets/gregtech/textures/blocks/resource/lignite.png b/src/main/resources/assets/gregtech/textures/blocks/resource/lignite.png
index 82172dc2c6f2db5c2284132469e9123a0daf5e61..4bbf7ccd72cefe2f4fb1156133d3ba236ac8c07e 100644
GIT binary patch
delta 741
zcmZn?S|haK3=@lqv6a!}3ry+|#&0G|6;q?cMAMW+Q(aRNQxjd&Boh-|3&YeD-Bk0`
zq$E=Vi{xa}l+6*$bxcI5oUF?#!wRy*a<U(5(BxdU$og!ztJfJAn7lk)978lFs$Pih
zyKN@Y@X-0w2ep%%=AQcIW94CdGFyP9_Lb1C|Ex<KCio@v<VKoLdSuGKx%vP96Z`+y
zY(92u4nx9alkW@J85ksDZ)N`cP+`)&m)~|#fR~c<w+;7Ob{rF7<Z^X6a&Y~^DapGz
z6Zi5v^K>d2IqiO2-^ldffh>bce3_J{;$~Bh4XdTI&rT{ny_7S%JM_%Ur~kzn4oo{8
ze0^=EX?Jnn)m@huyiOI{Z|(ZI!HuEoihf(*EfeXQiuy$@y!zLJymn{qdi?PE>Gkus
zYYRW=e<#Z@<LKGbI<2?f&DxcBGwed4gvH|+uJ?bwmR<JpJy%vL>?Biv-0;|f)@fc>
zHto8XS8`G^u;66)_G5E=BI@VpGZegAZmxGSG&DQ=ZqC`%nT6URewJ$(8SZt>RABh9
z?xJPdF^lOn63b$e&i(vZlH?m(`|r#22Q{<YqrJk->&x16W0wYTG)^h{pr~>_u%ORA
zKfI>SDkd)ezJPrB?`133Zp`L5S$|wWd0~suDMtaPbB`y~B>LaI7sbqwcQz{F<kMU6
z6E_Gf_WgI^?Np(qQ%=roJI&v(J}dd!u0<@22Yw3#r%c)B*X{f7??&V9-QR^7{``Hq
z`dXG5_pv#DlEmWg#XYZ-icM--vv0=HN_h@NuT$^;*M7HSV7UGEHOGgK9}hHsJGUt)
zD@#!|^|o*7T20maz5VyN6g?Cbt5_IVIPBJ*+a5D5hC|h3=2o^qo_kxnGGpI<w`O?p
z+j?6J*FovnR)IbI{_^vV{r>Q{Cb4PD(vs5PtFNkdMrH?{3tDmCu|CIRp~r<n1|aZs
L^>bP0l+XkKurN=%

delta 698
zcmZ1@)Fiaw3=@l?g_Yst3ry+|#&0G|6-!ey1M@_KWZfj=R1;m36cY>Gq!e>w-PBZb
z1LMTBB=Zy_<INGwbxcI5oUF?#%L25+a<U(5(BxdU$oentcO@AZm=ru+978lFs$Muf
z>9T=<!^LS)y540%#}&`;^fxW)GX4MGH9*AKW6q5*Z(Y;w$op4qpB?{x{!C0XbA#Qn
z-$m>U3=uouGR^f9R^O*z-u`5-d-lf*zk|G2hdK(*b&lC_h3)b_{h(>76Qcy@nx@U^
zV`FfBp4F^#Yoc=fBHi3o1rkY*jx3TD>@GQX_1d*k-!tpJo5&tlYPEbm$61`IL4DVm
z?E8@uFNx?xoy%GC^6`UvbN!Fqc%2(|bz%SGl0UzzeiqLaJX>MGz)*Z|Tki>e=bpa_
z`)VZ^4_Nn~3!Qi?O8)WdT)B1*hR(~;r7pER{iz#uUQLh*JhyY(G_U%fwL2LPq{iLf
zvFEd5$(cQ>`*fxE&H1+0G$1r|q7v6NDTW)z`9v6czSrH|wrr}5EWfo%`+U276Aq_F
z7qu34Jb!6%WWlOq4%xmgS)%Pv=2Y*!cc=aP@!Ma2wN+TXN#>ck(_^ht&}zeDQQQxD
z4FA9Dj}l#8TVs9Nwb?z_>VA6mn))lJl#Um^w`Dvq$)c*t&i_Z=ec{0DSxYUmbrxMI
zy5H3_Z}~*a<wrWc-JZT)Q+492tn4|J+Fcn833sPWm0qN|=*&(L!($bT=I^hYro_;o
z7!X=vDL;2>{}B!W8^K$#@<QrYzj*|y3QuI55GBJ9!K|eF{8DvLXfjXKYzxaJt;P2p
zZeD1;o5#-3fBf**c^xr4v1^06Y;5gyzaM{pn)l*@tA!o0&+|XevB(To`Y%7FB=K_P
SPKH(nAn<hcb6Mw<&;$UpRy8*O