From e2220440ec5bd9cb93729ac587d9320b7326711c Mon Sep 17 00:00:00 2001
From: Till Affeldt <t.affeldt@tu-braunschweig.de>
Date: Sun, 12 Apr 2020 01:45:37 +0200
Subject: [PATCH] Implement classic texture style and allow users to choose

---
 commands.lua                                  |  18 ++++++++
 init.lua                                      |  40 +++++++++++-------
 settingtypes.txt                              |   3 +-
 textures/moon_1_classic.png                   | Bin 0 -> 610 bytes
 textures/{moon_1.png => moon_1_realistic.png} | Bin
 textures/moon_2_classic.png                   | Bin 0 -> 638 bytes
 textures/{moon_2.png => moon_2_realistic.png} | Bin
 textures/moon_3_classic.png                   | Bin 0 -> 576 bytes
 textures/{moon_3.png => moon_3_realistic.png} | Bin
 textures/moon_4_classic.png                   | Bin 0 -> 269 bytes
 textures/{moon_4.png => moon_4_realistic.png} | Bin
 textures/moon_5_classic.png                   | Bin 0 -> 545 bytes
 textures/{moon_5.png => moon_5_realistic.png} | Bin
 textures/moon_6_classic.png                   | Bin 0 -> 602 bytes
 textures/{moon_6.png => moon_6_realistic.png} | Bin
 textures/moon_7_classic.png                   | Bin 0 -> 620 bytes
 textures/{moon_7.png => moon_7_realistic.png} | Bin
 textures/moon_8_classic.png                   | Bin 0 -> 75 bytes
 textures/{moon_8.png => moon_8_realistic.png} | Bin
 19 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 textures/moon_1_classic.png
 rename textures/{moon_1.png => moon_1_realistic.png} (100%)
 create mode 100644 textures/moon_2_classic.png
 rename textures/{moon_2.png => moon_2_realistic.png} (100%)
 create mode 100644 textures/moon_3_classic.png
 rename textures/{moon_3.png => moon_3_realistic.png} (100%)
 create mode 100644 textures/moon_4_classic.png
 rename textures/{moon_4.png => moon_4_realistic.png} (100%)
 create mode 100644 textures/moon_5_classic.png
 rename textures/{moon_5.png => moon_5_realistic.png} (100%)
 create mode 100644 textures/moon_6_classic.png
 rename textures/{moon_6.png => moon_6_realistic.png} (100%)
 create mode 100644 textures/moon_7_classic.png
 rename textures/{moon_7.png => moon_7_realistic.png} (100%)
 create mode 100644 textures/moon_8_classic.png
 rename textures/{moon_8.png => moon_8_realistic.png} (100%)

diff --git a/commands.lua b/commands.lua
index cc0c785..c4b7020 100644
--- a/commands.lua
+++ b/commands.lua
@@ -28,4 +28,22 @@ minetest.register_chatcommand("set_moonphase", {
 			end
 		end
 	end
+})
+
+minetest.register_chatcommand("set_moonstyle", {
+	params = "<style>",
+	description = "Set your moon's texture style to the given preset",
+	func = function(playername, param)
+		if param == nil or param == "" then
+			minetest.chat_send_player(playername, "Provide a texture style. Possible styles are classic or realistic")
+		else
+			local player = minetest.get_player_by_name(playername)
+			local change = moon_phases.set_style(player, param)
+			if change then
+				minetest.chat_send_player(playername, "Moon texture changed successfully")
+			else
+				minetest.chat_send_player(playername, "Invalid argument. Provide a valid preset.")
+			end
+		end
+	end
 })
\ No newline at end of file
diff --git a/init.lua b/init.lua
index 598a6c3..9cf8f95 100644
--- a/init.lua
+++ b/init.lua
@@ -16,22 +16,19 @@ if not state:contains("day") then
 	})
 end
 
--- retrieve and parse mod configuration
-local function get_cycle_config()
-	local config = minetest.settings:get("moon_phases_cycle") or DEFAULT_LENGTH
-	config = math.floor(tonumber(config))
-	if (not config) or config < 0 then
-		minetest.log("warning", "[Moon Phases] Invalid cycle configuration")
-		return DEFAULT_LENGTH
-	end
-	return config
-end
+-- retrieve mod configuration
+local PHASE_LENGTH = minetest.settings:get("moon_phases_cycle") or DEFAULT_LENGTH
+local TEXTURE_STYLE = minetest.settings:get("moon_phases_style") or DEFAULT_STYLE
 
-local PHASE_LENGTH = get_cycle_config()
-
--- set the moon texture of a player to the given texture
-local function set_texture(player, texture)
+-- set the moon texture of a player to the given phase
+local function set_texture(player, phase)
 	local sl = {}
+	local meta_data = player:get_meta()
+	local style = meta_data:get_string("moon_phases:texture_style")
+	if style ~= "classic" and style ~= "realistic" then
+		style = TEXTURE_STYLE
+	end
+	local texture = "moon_" .. phase .. "_" .. style .. ".png"
 	sl.name = "moon_phases:custom"
 	sl.moon_data = {
 		visible = true,
@@ -49,7 +46,7 @@ end
 local function update_textures()
 	local phase = state:get_int("phase")
 	for _, player in ipairs(minetest.get_connected_players()) do
-		set_texture(player, "moon_" .. phase .. ".png")
+		set_texture(player, phase)
 	end
 end
 
@@ -89,12 +86,23 @@ function moon_phases.set_phase(phase)
 	return true
 end
 
+-- set the moon's texture style for the given player
+function moon_phases.set_style(player, style)
+	if style ~= "classic" and style ~= "realistic" then
+		return false
+	end
+	local meta_data = player:get_meta()
+	meta_data:set_string("moon_phases:texture_style", style)
+	set_texture(player, state:get_int("phase"))
+	return true
+end
+
 -- set the moon texture of newly joined player
 minetest.register_on_joinplayer(function(player)
 	local phase = state:get_int("phase")
 	-- phase might not have been set at server start
 	if phase < 1 then phase = 1 end
-	set_texture(player, "moon_" .. phase .. ".png")
+	set_texture(player, phase)
 end)
 
 -- check for day changes and call handlers
diff --git a/settingtypes.txt b/settingtypes.txt
index 8a40347..5272e6e 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -1 +1,2 @@
-moon_phases_cycle (Change moon phase every X days) int 4
\ No newline at end of file
+moon_phases_cycle (Change moon phase every X days) int 4
+moon_phases_style (Choose a default texture style) enum classic classic,realistic
\ No newline at end of file
diff --git a/textures/moon_1_classic.png b/textures/moon_1_classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fd3f1bba38d225ea4819b8cd49c6ef2a0d3e46f
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006hNkl<ZILn=q
zO-~b16o#LB=T7H~=?86~P}*Pxci;kIg_s!k2D_1sJAZ+R@lUvQ<=#JH2yr7C7aEC8
zjDiW;V(r(=bV~2IDGLn>`fN^e7VkNE&JlnBe4q?W14G~#=mP^l0t(0gCJ+N{AOc1T
zFz?*HwSDmA=>ExQTo3{;j!&G{al07=QII4_qP5mztu+aq1Prb9*Zg$mMYGj@q5vlv
z#@ovDH>9BvLSR}6o<E%fNVL`fVL0fAVKC@+d!1f?;CH(HCE%%AUAf{KhO8t>0>EiK
zMMx<DT+dItu9ME^b93X9(da|t)4MnxP08B&idme=7laU;i%=j^7^Z7lR>}f=X__jU
zpP%*lCj_RcjBM6-)%9zuY7m4*DwQINq6<fOo|CSWi)pn{yPE2B`y3o;c6N3M!|?2x
zLj2+<45J{IEeA4_@%sy<*`!{tv$(j(pIrPdw@}CxtJQK=0$NHLd!9!+o#sL^0c9A8
z<5(j(`MkDm+f=JnT-RlCxxZqXW?We)ewTm-c5T~cb90kgt%l<`=Z5^~bjJ@KJwB8(
zm75`OD5a!SDp9Z3+1lD-d3hPjvd#=rO5sm=Js_<nz5U5rR4Nq;g#v49YwYdq(P%Vi
zHk-6sEs`X`bzN-RraX7~&C6GBy8__b=jZFd5^w{U0dnK<SOr03MbR)D$0MWD?OSm?
w3d3mFd%yqjb@kH1?%jJ2pYb0^AT_D{1feU?=_Ij+HUIzs07*qoM6N<$f(}|2761SM

literal 0
HcmV?d00001

diff --git a/textures/moon_1.png b/textures/moon_1_realistic.png
similarity index 100%
rename from textures/moon_1.png
rename to textures/moon_1_realistic.png
diff --git a/textures/moon_2_classic.png b/textures/moon_2_classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..8107343787cc814909fa4cc0582f30846cdf446f
GIT binary patch
literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006-Nkl<ZILoDz
zPiqrV6vcn<&Ai4=GD(v(f3&8csTG1qPz1q1L9HJ_@cX!PCAe^-xbQQ$a3KbF#VV9i
zY!k2sjkHNRX-Q|MGnpATlVWST@@(GY-S^JD=brlnCvgD~fClJ*8=nWjRJ?{j6yF;Q
zfZa~>Ca`1;53W9c@%G-wPoJy3-d^9fT|0`RC=A0e2*WU!%e)+o?3#Dvj|+uttNXk6
zN{=%<3e@5=%{U}iyhh6Wj*-mf0HQDq0UYOW<T&=zu^;UF{&>_M3?Bfm_1#WW0riOn
zA;bwyLP`l>B+ay8OsDht?8RX0`>pnm4bStX1g3#o08&aanGBkyaVCTgVhT+eDv_8<
z0Gb{*W*$J-bru#DNTpI(mc{uHm}b&>c>k`Hapw~gg1Nal3WdTyQcgqD<fZvaxhR2T
zYzaaL(&;pnN`+WD=k>;MT>H-L8?FTG*jE4y!=TY<P%4#>QXW5yqUZ#{>}<9?lQFY0
z9t>|1&~=?^wMwm4L(?>b5NFDn$(VudxKam>01GfCLDMu@US7twZQAWNmSqtH0Z|kk
zS27+4zT>!_*zGi@fj5C#eEfF?-}e~|2DDl&*4NkB+1X(@9MbJ}ab1^#{oY`6Yx}ZZ
zoL_QwJI$Y`OH@ixDwW9R^VI8gJkMh^8nL#v#_H-St#4oZn_Jt)WRy40bXy3NQYfVW
z$mMdB%Vipk2K`?v?>;nFh7*D>n!oh~XaGeZ8~;cJ%m6apAL^1lBgOmK>sK~n1O5+x
Y08C%m(ag8&2><{907*qoM6N<$f`$Vm0{{R3

literal 0
HcmV?d00001

diff --git a/textures/moon_2.png b/textures/moon_2_realistic.png
similarity index 100%
rename from textures/moon_2.png
rename to textures/moon_2_realistic.png
diff --git a/textures/moon_3_classic.png b/textures/moon_3_classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..e38175e50ce744a1f332db999eed01cbfecb8242
GIT binary patch
literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00069Nkl<ZILob*
z&ubGw6vsa^yPHimBx&01_J?*!4)!2!2^FCfp`ap!27*Wb7!QIsuO7VUA^$^Z(Nhn-
zc<@-LEd-0SG^rX(x?8h5yI!^-O$#FUg@HHoX1?#e?|UP-3IQY|wwA6K$N(y}lhhvx
zfX?Ce60im=0JBOdd+X!Q){B>KR(|%*?x;u!702=9Wa(|c@82E#4x{Pm^8V3r_nn?b
zd#a4Z*OzI;TFlJti@LY8Oy}ez1_*-leh~PtqEP(`!>E7yz4sV+uXhf&4WKq!hm?{^
zrGo3a^m;uRh9OqIP_(REacZhOr=l?2Klr*k7=%&+IbeBA3reLDjYflNwTfXFsVX{%
z44PpXrkODTO;3e!#|fmA)M_;}O{3Ln(Qda<N)7cb6!O87M=MeSS-|85=(>*Qc{H0%
zY}-Z%G4yGgoOc&y9SP*qmH?0>$u*MI)m0je2E}4=cpd~7{)7AXE_A>j>HUyoG+HK;
zp<b^erDS7cgKoFW{G8+1c6mZi2V(%}073|oB)LXnnkMV(>v*2W=H@1radtN2OexVh
z+|C1g%2>R0QyHTqm+*ZbEjsvQ<+9IYn!(PMdA{M%C@jmu%4LrnckM_z?pgqR8^0uk
z_#4qFfJ`@g{5y`h6b|^Tg<qZn4*>@#r@znuCelC#a1Q(cJ^;J?5BveuEvbn3M+q_j
O0000<MNUMnLSTY4f(E((

literal 0
HcmV?d00001

diff --git a/textures/moon_3.png b/textures/moon_3_realistic.png
similarity index 100%
rename from textures/moon_3.png
rename to textures/moon_3_realistic.png
diff --git a/textures/moon_4_classic.png b/textures/moon_4_classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..d674eee621f6ab8cdec321caa686b7013a3cb7a7
GIT binary patch
literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002gNkl<ZILocm
zPb&mr9Ki99XDlT`G@;Bz$w_inbMqed9Vzd~ZQ5KNl`W+qwrQh1aF|_jdFBPo!}s_*
ze1HG>BTLZK)hS9GVh=lLF~t`aSj7w<G5(kr<!CvIF24uI*L^Z)^YIl%p{c8NoF!C$
z1OX>FPY|qif_)STf{muGRs!-kpp*&@0(QG?^klPZp~X*vV9^Plqa=xdNj#3e%+LnB
z;5I=p$&2ze<VE=uC4HH8Ex<#9;0?N8xXb3_Aui%wY$L+}TQSi9pLoX&?)?Y9<R35{
TjGpEa00000NkvXXu0mjfKEiI-

literal 0
HcmV?d00001

diff --git a/textures/moon_4.png b/textures/moon_4_realistic.png
similarity index 100%
rename from textures/moon_4.png
rename to textures/moon_4_realistic.png
diff --git a/textures/moon_5_classic.png b/textures/moon_5_classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..4536a3ab1d4bcbf3e4ee1cc826b0445730dd6ef9
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005#Nkl<ZILoDy
zPm5Af7{-71oNMX?lBJ^!<*uamty;`36X{d5D2P5n-=kHVc0!PG!A%gtAi>N8V$Gr^
z1f6ll>orHE>!0iKwCLJ6=nPaZ9C*)r&UxPFJkJaN83uq|FFgY80uO+zz-7P#X26M`
zE1(P5z!tE-p4!|oeV}_PaQnqyG=3(%uTOv-;TNv|1N$_<93XbyEv+?L>s3cL?0P9I
z?0RX#9ga3!*S)aa3XuDNFxyTy{LcDt)Ab@`vsqH96jI7ll?~%O22mhrw(O34^Y(ot
z5R6c%RLJFWWHK3o!Qc{z)*8bw=H*L(5RTJ5X&%|O=Xo@nP4f9X#bS}kWOCN;(}#;A
zuqL*5KZnBM(AvD(@At7Ri*mWlbUM8VL<2uXy>V<SHES-4<v0$7LV;?vx&*QiV_+n|
z?ClFF<@0DX8uJGetu=$efJUQ1JRT>ROfG#v%sStJR{~Ju@noz#*F#T0|L*8{9<^Ex
z%d+V8daD?G0*2C;<8j;h(Q@5ke>PJdT5Hn`1e8*Gs+5sVr%5CdXIO|?=k<DObISyD
z?An!=?RNLpXgoH}q1-z-JbEgH5Ym*o)jIsvI@tXv?t~snDIMS#XaJ?T6#_7QRp)yN
jO#EE=OE1{>XR>|)F1p<ryVgM?00000NkvXXu0mjfMWp~K

literal 0
HcmV?d00001

diff --git a/textures/moon_5.png b/textures/moon_5_realistic.png
similarity index 100%
rename from textures/moon_5.png
rename to textures/moon_5_realistic.png
diff --git a/textures/moon_6_classic.png b/textures/moon_6_classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..42c35d801d34f066565df3e6c1d967afbe962986
GIT binary patch
literal 602
zcmV-g0;T<lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006ZNkl<ZILoDz
zKX21e6vcmjc7pA+C2o>dEvQUcP-fPOg^kZqBqqKEh=B=-5hjGh2S99<!bGV+P?ykz
zs19k<B;cfJohJ5sW@v&;RAAspPw&sYI`_PL-h=;y2GI64Zv)qXTfica0YX3ly~$bv
zKF|irKy_(teaisE=Sux%{>qJewr!J6r_nU+Uxn}L;g=0yO9z~N@8JGkZ9hL84lzv=
zDJ4=$gb)ZJE+iD{``*JxPhT5A&^&DC2f;S3>$1AKN;aEid3l*qsYJ0@B$vyPN~LBw
zuC~2ROMm|C!L^S&)eWhH6-5!fUXNC*MZI39QmNp19)&^y$8iusBo$<V$A)E@X~WP{
z<LEpP$MLVx?RN2fAKSKBSy{nxoTLH=xFl@LRK5N{pVc=dky7HiF11>XD2kFPX+Vfx
zf8ck!e(N`HCryjv7^M_PM@N*)Wr84>eFC<4`|guzS*AT(Jqe{0jYfmx<Ktv322O?7
zXtkwO2Y)j?j$=BV4$WpWd5sZpCSJUJr3Qmj>zwe<I5|0?TCFAtJU|zK9F4{!83rNo
z7~<$c0x2c^ejlaO^k^Fx8h{#yVYstf{V+e5nOj(xzie4{#<DVV09wNQnclo#T3Zhd
zAkOEqPdXjHcs3dt#!z>^H4pFT;vAZ$X|`?Jg~DR~M|-a(gWWfJdf_XuIkiFn#-yv$
oy$*~gGk^(1lOGuaXHywJ0h!zdxLqo4JOBUy07*qoM6N<$f@UcRSpWb4

literal 0
HcmV?d00001

diff --git a/textures/moon_6.png b/textures/moon_6_realistic.png
similarity index 100%
rename from textures/moon_6.png
rename to textures/moon_6_realistic.png
diff --git a/textures/moon_7_classic.png b/textures/moon_7_classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..14a3abe8aef44c5e1228ccc9de2ae58a09b70795
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006rNkl<ZILnoj
zOHUJF6o#K~Zk?I7QwpsRi%m>OaA$;-u<#F<NL;&j;od)COkBD*ZuCzmN+Strw8m(F
zR4E0aLMhYE4AXBeF1W;KP<)fKJ(uTwkIJzWKnK#3y08SGynO!nUh`{v{@V1_8<v^L
z8-{KboLp!adTg4Ro^6|<s;Uui0Ca%2!1|@?trZQh-YnJcZhrUgyjuE#@B0WLD3wZ-
z%VnmfrkI_brBb<!ZQCe{0`NeUtM`Ew4RC7j-e1>@JW&*#tu`18Xti228V&08Ix{mf
z%+1YFsZ`K)9bg(j1Kj?=%jX^IkNc7&Aq+#-*4AjZ+jKe|78Vw$R;#Em*=fDDlqZiK
zPL32D^>3h(Bq0a_mY0{Q)oL6a9RbV(iqdNDj7lkuf6-2o1mE{*Hk+pnia<sQf>4j*
zSX{)iG)-|`7tixZlEeTMb*xw@eB0Q%op(lxXWokQ`+1&65Cl{vaw+gsJLtK#WtsNx
zlg?8R1S~Eta%DmxYg<EYb$!D%Ga0uy%J@aoHyjSx+WrxDyS+&1_4>Y)QT(3?W_x?L
zFJ)wEKtBwJVJv;AYPt>z2<@LRcRKrf?X6v@0fV8G^3&(_5BXd+=Q#O-W!YKF%H{yX
zNp?@+rfG^0f;diEjgPCo1`G>M?%96#@aCaA7<b)48$m%;jwOT;wr$#_v0~XUv>;9K
zG+o^@GZQa>K>YH`=1DjVKmvzA1SCKf$N^(O2IvBtK>sI~yz=x^%Nzax0000<MNUMn
GLSTZ-cpAU}

literal 0
HcmV?d00001

diff --git a/textures/moon_7.png b/textures/moon_7_realistic.png
similarity index 100%
rename from textures/moon_7.png
rename to textures/moon_7_realistic.png
diff --git a/textures/moon_8_classic.png b/textures/moon_8_classic.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d7beb8065852f68443a92759630f668a48b8c6f
GIT binary patch
literal 75
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`LY^*;Ar_~T6C_v{Cy4YgaWF8j
X2rw|V+OH}C$})Jm`njxgN@xNA_#zJ}

literal 0
HcmV?d00001

diff --git a/textures/moon_8.png b/textures/moon_8_realistic.png
similarity index 100%
rename from textures/moon_8.png
rename to textures/moon_8_realistic.png