From e57a95bc9f5331286c164d2792e18c14377028be Mon Sep 17 00:00:00 2001
From: PaulGoersCode <102575758+PaulGoersCode@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:02:04 -0500
Subject: [PATCH] Solar Panel and Fence

Tweaked solar_top texture and redid solar_bottom.
Added Solar Fence
---
 .../models/block/solar_fence.json             |  85 ++++++++++++++++++
 .../textures/block/campfire/ashes.png         | Bin 800 -> 464 bytes
 .../textures/block/solar_bottom.png           | Bin 0 -> 709 bytes
 .../textures/block/solar_bottom.png~          | Bin 0 -> 670 bytes
 .../textures/block/solar_top.png              | Bin 0 -> 711 bytes
 .../textures/block/solar_top.png~             | Bin 0 -> 716 bytes
 6 files changed, 85 insertions(+)
 create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/solar_fence.json
 create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/solar_bottom.png
 create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/solar_bottom.png~
 create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/solar_top.png
 create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/solar_top.png~

diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/solar_fence.json b/Common/src/main/resources/assets/hyperlighting/models/block/solar_fence.json
new file mode 100644
index 0000000..e753350
--- /dev/null
+++ b/Common/src/main/resources/assets/hyperlighting/models/block/solar_fence.json
@@ -0,0 +1,85 @@
+{
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "block/oak_planks",
+		"1": "hyperlighting:block/solar_top",
+		"2": "hyperlighting:block/solar_bottom",
+		"particle": "block/oak_planks"
+	},
+	"elements": [
+		{
+			"from": [6, 0, 6],
+			"to": [10, 16, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"north": {"uv": [6, 0, 10, 16], "texture": "#0"},
+				"east": {"uv": [6, 0, 10, 16], "texture": "#0"},
+				"south": {"uv": [6, 0, 10, 16], "texture": "#0"},
+				"west": {"uv": [6, 0, 10, 16], "texture": "#0"},
+				"up": {"uv": [6, 6, 10, 10], "texture": "#0"},
+				"down": {"uv": [6, 6, 10, 10], "texture": "#0"}
+			}
+		},
+		{
+			"from": [5, 16, 5],
+			"to": [11, 17, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
+			"faces": {
+				"north": {"uv": [0, 0, 6, 1], "rotation": 180, "texture": "#1"},
+				"east": {"uv": [5, 0, 6, 6], "rotation": 90, "texture": "#1"},
+				"south": {"uv": [0, 5, 6, 6], "texture": "#1"},
+				"west": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#1"},
+				"up": {"uv": [0, 0, 6, 6], "texture": "#1"},
+				"down": {"uv": [0, 0, 6, 6], "texture": "#1"}
+			}
+		},
+		{
+			"from": [4, 15, 4],
+			"to": [11, 16, 5],
+			"faces": {
+				"north": {"uv": [0, 0, 7, 1], "texture": "#2"},
+				"east": {"uv": [0, 1, 1, 3], "texture": "#2"},
+				"south": {"uv": [0, 0, 7, 1], "texture": "#2"},
+				"west": {"uv": [0, 1, 1, 3], "texture": "#2"},
+				"up": {"uv": [0, 0, 7, 1], "texture": "#2"},
+				"down": {"uv": [0, 0, 7, 1], "texture": "#2"}
+			}
+		},
+		{
+			"from": [4, 15, 11],
+			"to": [12, 16, 12],
+			"faces": {
+				"north": {"uv": [0, 15, 8, 16], "texture": "#1"},
+				"east": {"uv": [7, 15, 8, 16], "texture": "#1"},
+				"south": {"uv": [0, 15, 8, 16], "texture": "#1"},
+				"west": {"uv": [0, 15, 1, 16], "texture": "#1"},
+				"up": {"uv": [0, 15, 8, 16], "texture": "#1"},
+				"down": {"uv": [0, 15, 8, 16], "texture": "#1"}
+			}
+		},
+		{
+			"from": [4, 15, 5],
+			"to": [5, 16, 11],
+			"faces": {
+				"north": {"uv": [0, 0, 1, 2], "texture": "#2"},
+				"east": {"uv": [1, 0, 7, 1], "texture": "#2"},
+				"south": {"uv": [0, 0, 1, 2], "texture": "#2"},
+				"west": {"uv": [1, 0, 7, 1], "texture": "#2"},
+				"up": {"uv": [0, 2, 1, 8], "texture": "#2"},
+				"down": {"uv": [0, 2, 1, 8], "texture": "#2"}
+			}
+		},
+		{
+			"from": [11, 15, 4],
+			"to": [12, 16, 11],
+			"faces": {
+				"north": {"uv": [15, 0, 16, 1], "texture": "#1"},
+				"east": {"uv": [15, 0, 16, 7], "rotation": 90, "texture": "#1"},
+				"south": {"uv": [15, 6, 16, 7], "texture": "#1"},
+				"west": {"uv": [15, 0, 16, 7], "rotation": 270, "texture": "#1"},
+				"up": {"uv": [15, 0, 16, 7], "texture": "#1"},
+				"down": {"uv": [15, 0, 16, 7], "rotation": 180, "texture": "#1"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/campfire/ashes.png b/Common/src/main/resources/assets/hyperlighting/textures/block/campfire/ashes.png
index 9e1e82b9679673e485e542ea4181953690b6895e..ff5aec88be9b4061ad3bc75e3628096ec373ddf5 100644
GIT binary patch
delta 449
zcmV;y0Y3hq2G9eL8Gix*005AYXf^-<0hdWcK~y-6m6Fd+!axwlhb|(Nbd6mxp}QXZ
z(-;h5I23LM;Q@SBUjV&|2?tH2Ne^<^R*kkMTM!DGdKhht2aUJQ>~ChiZ)S3Jrx!=T
zVm>Vt%iM0MP#!d#+v}?^@CwDUVOjuy0JH2c@W@`{7$ALLCVxm%CPu@4Mbuu^lVMs1
z4JUci5Wrxr?(`@V0N{IrcIQ<3_bQZe6d0yOnNXnw00i)@Q6>bhs!(#fmC@X8VF{!K
zuln8q(=-6My}qJM_}%~|wL7O-S{wxkpx`(P$lCe_(u?`@eVG8HPmck*B>9zQyDP`;
zCoqc_^Qo2z-G4qjLETupP%HxgN<sjG|29oF`A#xZt2(8O%dwlx6lDS+jiUe{rA+MF
z`=eo>GQO(QWTr@|RIG@a?+vnVId)Oiv+rV+?|`<LPqXo1QvkrAVOl8f?&drL2-~y_
z)2fKt?`zKPfNbp@;nbS#u8JoB>9g;m<I%8>GAQGCV>&9H<myiE#~iSAHYmZXmltQa
rdlkxmn<l!hll;o$<>8Mtf8D_cCahG#{d1N900000NkvXXu0mjfd!W(&

delta 788
zcmV+v1MB?I1E2<w8Gi-<001BJ|6u?C0dZ+VLr`gBV*mgsk#&*1OT$1I#-Fxoi&i=)
zBI=N#ibD%UK^&!mU8+M{!KzDgO<EyI!zD$EtKi~La1dSm8vGA*6<ierK@mip`~&=2
zq{R1{LW|T3ckhoU_q^Oa2l&%EGwiMeV3-ciq>|D~epL#-A%BD+^w2sgGuv9sF68j<
z_<n#-)cd&T_5Z$(qpzUa4Df}BXPCtu;yL2<reg`-B_3oYxj=kO9OHCA;v1nW9={4M
zdi*Jv=Q8tvU-XoUZLG90D{+H(k~nJU71lhDxJg(wm$OtyXpX@~1}P*VK|uu@(BU9X
z)uhZi`w|V`5`W6%VYFJPf|H|&5_w~!R;a5=RU=)cPe)bc{x?rso1XHzhm%0}i|c-j
z1HnC@UUS`_6W6Vu0)c1X%53?|l+)}N>9v*?Jpv-zz{Pb-Q}%(&9bov$lDXWF0yO=a
z2E3mG{dr*E4(MI;vTFXv*&~qKq9?iq4i13{+8<f}1%JZlXYOD?txW&`010qNS#tmY
zE+YT{E+YYWr9XB600C7=L_t(IPo<MVFGEofg{Su+%@c%nqwU6`8$n`G-4;K<U+Q1-
z3)o^uB9bmxygo!qq68Hw-%ZZTL`0hOZrYhSbMCok=9M;D`{UtbZlm{Cn=8*-y}4u0
zgUr^qT7PzVerAKb7xN1%HRA|dsWoFQELIw^=$px%93L9LYKG8bRV$%@fYa}tTDx;#
zS^qYw;5Nvq6LW-B92GR`s}X>F-%KoGHG}0M5d{jol>`Nd_>U5)fCx3h$|rKk(sH${
zW{mv${P@9*?cqKz3`=HaZM(f^+09jP(dca$jen0%(0kT4cZ)Z}&P|x8<FTquZzAkc
z04sjT2PS|L#f%c4{4@f9-v$Ew&p>Z>zzEMOHQb^aN<?^laa1TE7qn>_%_Ljsu|b=L
z3Z!$$5v#^p%Lo6hfQ?i5Yeh9Ozs_tSWZKa9glSDo(lqU|X)jNAlW(Eh*l)GtM<nw<
S4GlB^0000<MNUMnLSTYcxN>Iz

diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/solar_bottom.png b/Common/src/main/resources/assets/hyperlighting/textures/block/solar_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab7eef2be7e08a5fff9cf6e7cab8a53aadfaf215
GIT binary patch
literal 709
zcmV;$0y_PPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YEhISQA0(;B`g{eq97W>AQx*;gRB<4`4OmH?o~osgO&!NA!_Ms
z=s&16Xe|hWB8X^f?`sLUy+;Kl@?6e+e>~?rFYkRWID;8IYqiWkHkUU;0l&5sUDn#(
zaM4dULufJGGUmf`5t^>=2OO&2`&6&y_x@d-YY9sSN4xNpZkTytnTFtI-cY<N+^eT!
zYr@CEW2Ou!e53Sum0uO7s{E<gjD%*vsd{Ru297tdo;I_>qr%>7rl8m6QD5Rt<QBtH
z2V@Uo5h8#ejW`9?$&kk<H7A+<?;Ef97T6GvE^mV(rZ`fh#XBZyLAoZSCPh!klcA_`
z|C^_koSdk3cl)9B#kN0&p=}S!CENZvvF-9HxSruESNCs7PSanam+G4L2t3<xab4Hq
z`*67feNRTrj8!C;Y-chF@8{4Jg`PX;SgB@JJLl{XB3tr{ZsFh%M&!O{^%p=3XeXR7
zo~{4@010qNS#tmYE+YT{E+YYWr9XB6008|-L_t(IPpy+b4}vfd#gBrimd(V$guy`v
z!@~Ff0<10$PA*Ok#t;!2Bg$)YL=@#uY(h#O$GzishZD!~gUY3~#zs;~v$KXXp0Unx
z94lT0h}pHE&GuAFQrt&14G*DVdF;T6lGGGrT-&sn>yW6d2He2hgA2-G=S&wSRTmBK
zdI;X_&o%!`syk^!zGV=FmNYvfVH8eVH7SLypbN03xIm5Rqm6x78V2|T^nM6LDb;s~
zhht7@npXuifz{fzZCo#XGpgKDKwK?Ud3Jw-CA!%Pu#zOPdyh#B<|V{F(B5PJ2XUeV
r;m2SOm@o_pG%V02!bO!vWcfS+w@4Pb2{U{T00000NkvXXu0mjfyf!*2

literal 0
HcmV?d00001

diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/solar_bottom.png~ b/Common/src/main/resources/assets/hyperlighting/textures/block/solar_bottom.png~
new file mode 100644
index 0000000000000000000000000000000000000000..16828cc2f5b3fe97a4108fcc7b264d1eee3c4c09
GIT binary patch
literal 670
zcmV;P0%84$P)<h*8VUda01Zh<L{b0%01yBG01yZU0000V^Z#K000C}kLqkw$V`BgS
zD3NuMy-Pw-7{-5UQIsK3Lq)?SEE*D`AR5CU7i&<1tQNib5vX16RYF>WmIk3AYUyj}
zKd3cmEeL`lh-ho?YYDl%M+GJFT+V%eJm)+w?|m*fgBd+*wah>^mp4NJzqS-z*4o~1
z(N8x+XffR~=EHLlny&8$9ID>?RIldu{#~7G2}=h@yYQ55n0aBDhTvx2P`oSLtEXdY
z!pFj6rVJ>2qx5){UlpgS{HfTCgl561dTOZ#jyJHLHnYN`!rpAApx5S6U*b;W7Q<2p
zWDjByB7h%_I0e?pkjE!ACz<{48?X2l*bt8{Z-XMHI8vm=J0@yDx+bJ1MNi0+p{R2I
zo2QkWoTzqp`=Ry4wm*iUZ4b&N+x|JR?eZzOp5ZE2_iso}(_f;O>YDcmJlk+_UDx9K
zaJd70Pe#m)RV0^eXEF)z=g<{}o;&DRsb*C>=j;(8Tk?x;;ouNP<i2P17eEVWC!8>z
zt^fc432;bRa{vG?BLDy{BLR4&KXw2B0M|)GK~y+Tt&_nHf-n$7m$s(L-2;i?|Nn%K
z;NroPM-!07h%zP9KvJzK?tzxqEj!G%Mbk7dnZh}TL9DfYB*Qz_$eG7n1+awoew6my
z2Zpurxmz)8216KD;74wq7Zem=@`)XFAu42NOi<iV;<5@QrWp1bBwwz>s(#lE6I)A)
zF%dm`P*-yYSQ(q^N++4MYF5COeKRbUcPjVd+n5{P1N;JdpE4|Ftnb1W6TJdFelaX&
ztjJ@diPdCcu7T{_e@r}-N^miFv2en0NWc)wD^5n`Z`yCyjt(i9-v9sr07*qoM6N<$
Eg3u-`tpET3

literal 0
HcmV?d00001

diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/solar_top.png b/Common/src/main/resources/assets/hyperlighting/textures/block/solar_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..e288641394adcccae36a2844e1b633d7ba357ded
GIT binary patch
literal 711
zcmV;&0yzDNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YEhISQA0(;B`g{eq97W>AQx*;gRB<4`4OmH?o~osgO&!NA!_Ms
z=s&16Xe|hWB8X^f?`sLUy+;Kl@?6e+e>~?rFYkRWID;8IYqiWkHkUU;0l&5sUDn#(
zaM4dULufJGGUmf`5t^>=2OO&2`&6&y_x@d-YY9sSN4xNpZkTytnTFtI-cY<N+^eT!
zYr@CEW2Ou!e53Sum0uO7s{E<gjD%*vsd{Ru297tdo;I_>qr%>7rl8m6QD5Rt<QBtH
z2V@Uo5h8#ejW`9?$&kk<H7A+<?;Ef97T6GvE^mV(rZ`fh#XBZyLAoZSCPh!klcA_`
z|C^_koSdk3cl)9B#kN0&p=}S!CENZvvF-9HxSruESNCs7PSanam+G4L2t3<xab4Hq
z`*67feNRTrj8!C;Y-chF@8{4Jg`PX;SgB@JJLl{XB3tr{ZsFh%M&!O{^%p=3XeXR7
zo~{4@010qNS#tmYE+YT{E+YYWr9XB60093<L_t(IPh&iA;J|-&c6J63`1$iEn1=Du
z#X$1tYFR)61=)>YjWE#JSHVzT)PW*4VQM{wSWQbU0}Dvi-TQY?6ca1<{^Jh@7Lc=)
z6;)6Sc>V4_hS-zmKQP3;egztU&9?79|6#c5&AV?{UCMa;`0@WBLqIlwG=fZ(krH4K
z5oBU`^Zp+L$eA!PUasE^AlJdvf%Ji0fGrRUvM~b@T`VCh7rPfgF+*&?Vhu!W0S598
zdSHXSfXy~+f%xRv2hszPP{860L{O?j4_Its;6MZ=Bw_;$n>uhbq6ZGPK*S~n_X4`f
t*a8uo7{~y|&D)Ot|MBA&11PDI0{~7e(nq-Meo+7b002ovPDHLkV1nbRIvoH2

literal 0
HcmV?d00001

diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/solar_top.png~ b/Common/src/main/resources/assets/hyperlighting/textures/block/solar_top.png~
new file mode 100644
index 0000000000000000000000000000000000000000..c66b28c96a853f859612f17a2864d96ab7429711
GIT binary patch
literal 716
zcmV;-0yF)IP)<h*8VUda01Zh<L{b0%01yBG01yZU0000V^Z#K000C}kLqkw$V`BgS
zD3NuMy-Pw-7{-5UQIsK3Lq)?SEE*D`AR5CU7i&<1tQNib5vX16RYF>WmIk3AYUyj}
zKd3cmEeL`lh-ho?YYDl%M+GJFT+V%eJm)+w?|m*fgBd+*wah>^mp4NJzqS-z*4o~1
z(N8x+XffR~=EHLlny&8$9ID>?RIldu{#~7G2}=h@yYQ55n0aBDhTvx2P`oSLtEXdY
z!pFj6rVJ>2qx5){UlpgS{HfTCgl561dTOZ#jyJHLHnYN`!rpAApx5S6U*b;W7Q<2p
zWDjByB7h%_I0e?pkjE!ACz<{48?X2l*bt8{Z-XMHI8vm=J0@yDx+bJ1MNi0+p{R2I
zo2QkWoTzqp`=Ry4wm*iUZ4b&N+x|JR?eZzOp5ZE2_iso}(_f;O>YDcmJlk+_UDx9K
zaJd70Pe#m)RV0^eXEF)z=g<{}o;&DRsb*C>=j;(8Tk?x;;ouNP<i2P17eEVWC!8>z
zt^fc432;bRa{vG?BLDy{BLR4&KXw2B0R>4!K~y+TV?1!+z<+jjb_Njm`ST~3hVjwG
zK=SBnSwI2>*^OY0Fwogo!BAe*K~SuwrIvvOr0VYdJ1B~=iGeIaSNHzo4+a*Hvy>H8
zPz-qe?mvduljlD$#J+w78i38V??3-x*!Je#H>@sYJbwK6e~=*{8$cRCrpibOFo*~;
zF}!*Ij{)RNm>4hDZw8R-VCq2nz%IZRhy~fGfjD7mJy0F0SVC4Vb}wKHFi==w3v8@`
zh%LZAe`Cc6M6egI*@i6;pFI0OdLR-CSe$_f2{6>uiA@X~h`0iWnA8b(0eVWr7Kqry
y;0B=EhAj}WiGd7Y+`R4R{~teoF@TaPIRF5|zSKugkxE4X0000<MNUMnLSTZtAwH7;

literal 0
HcmV?d00001