From 9836d631f9c6df29b460d3a6dd8b25d7ee2d5ff9 Mon Sep 17 00:00:00 2001
From: Brandon <bzoss@mit.edu>
Date: Sat, 20 Jun 2020 21:17:45 -0400
Subject: [PATCH] Cleaning up old files and using a night-vision lite method.

---
 mods/ITEMS/mcl_potions/functions.lua          |   5 +++
 mods/ITEMS/mcl_potions/init.lua               |   2 +-
 mods/ITEMS/mcl_potions/potions.lua            |  37 +++++++++++++++++-
 mods/ITEMS/mcl_potions/splash.lua             |   8 ++++
 .../mcl_potions/textures/hb_potion_bar.png    | Bin 91 -> 0 bytes
 .../textures/hb_swiftness_bgicon.png          | Bin 1157 -> 0 bytes
 .../textures/hb_swiftness_icon.png            | Bin 1167 -> 0 bytes
 .../textures/mcl_potions_healing.png          | Bin 1261 -> 0 bytes
 .../textures/mcl_potions_night_vision.png     | Bin 1260 -> 0 bytes
 .../textures/mcl_potions_swiftness.png        | Bin 1262 -> 0 bytes
 .../textures/mcl_potions_weakness.png         | Bin 1260 -> 0 bytes
 11 files changed, 49 insertions(+), 3 deletions(-)
 delete mode 100644 mods/ITEMS/mcl_potions/textures/hb_potion_bar.png
 delete mode 100644 mods/ITEMS/mcl_potions/textures/hb_swiftness_bgicon.png
 delete mode 100644 mods/ITEMS/mcl_potions/textures/hb_swiftness_icon.png
 delete mode 100644 mods/ITEMS/mcl_potions/textures/mcl_potions_healing.png
 delete mode 100644 mods/ITEMS/mcl_potions/textures/mcl_potions_night_vision.png
 delete mode 100644 mods/ITEMS/mcl_potions/textures/mcl_potions_swiftness.png
 delete mode 100644 mods/ITEMS/mcl_potions/textures/mcl_potions_weakness.png

diff --git a/mods/ITEMS/mcl_potions/functions.lua b/mods/ITEMS/mcl_potions/functions.lua
index e47aabfc1..26b57262d 100644
--- a/mods/ITEMS/mcl_potions/functions.lua
+++ b/mods/ITEMS/mcl_potions/functions.lua
@@ -422,3 +422,8 @@ function mcl_potions.fire_resistance_func(player, duration)
 
 
 end
+
+
+function mcl_potions.night_vision_func(player, duration)
+	player:override_day_night_ratio(0.45)
+end
diff --git a/mods/ITEMS/mcl_potions/init.lua b/mods/ITEMS/mcl_potions/init.lua
index e3d86f954..ff42768a7 100644
--- a/mods/ITEMS/mcl_potions/init.lua
+++ b/mods/ITEMS/mcl_potions/init.lua
@@ -316,7 +316,7 @@ local output_table = {
 local enhancement_table = {}
 local extension_table = {}
 local potions = {"awkward", "mundane", "thick"}
-for i, potion in ipairs({"healing","harming","swiftness","leaping","poison","regeneration","invisibility","weakness","water_breathing"}) do
+for i, potion in ipairs({"healing","harming","swiftness","leaping","poison","regeneration","invisibility","weakness","water_breathing","night_vision"}) do
 
 		table.insert(potions, potion)
 
diff --git a/mods/ITEMS/mcl_potions/potions.lua b/mods/ITEMS/mcl_potions/potions.lua
index 439cb5b9b..57a2c6014 100644
--- a/mods/ITEMS/mcl_potions/potions.lua
+++ b/mods/ITEMS/mcl_potions/potions.lua
@@ -152,10 +152,43 @@ minetest.register_craftitem("mcl_potions:harming_2", {
 minetest.register_craftitem("mcl_potions:night_vision", {
 	description = S("Night Vision Potion"),
 	_doc_items_longdesc = brewhelp,
-	wield_image = "mcl_potions_night_vision.png",
-	inventory_image = "mcl_potions_night_vision.png",
+	wield_image = potion_image("#009999"),
+	inventory_image = potion_image("#009999"),
 	groups = { brewitem = 1, food=0},
 	stack_max = 1,
+
+	on_place = function(itemstack, user, pointed_thing)
+		mcl_potions.night_vision_func(user, 180)
+		mcl_potions._use_potion(itemstack, user, "#009999")
+		return itemstack
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		mcl_potions.night_vision_func(user, 180)
+		mcl_potions._use_potion(itemstack, user, "#009999")
+		return itemstack
+	end,
+})
+
+minetest.register_craftitem("mcl_potions:night_vision_plus", {
+	description = S("Night Vision Potion +"),
+	_doc_items_longdesc = brewhelp,
+	wield_image = potion_image("#000A0A"),
+	inventory_image = potion_image("#000A0A"),
+	groups = { brewitem = 1, food=0},
+	stack_max = 1,
+
+	on_place = function(itemstack, user, pointed_thing)
+		mcl_potions.night_vision_func(user, 480)
+		mcl_potions._use_potion(itemstack, user, "#000A0A")
+		return itemstack
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		mcl_potions.night_vision_func(user, 480)
+		mcl_potions._use_potion(itemstack, user, "#000A0A")
+		return itemstack
+	end,
 })
 
 
diff --git a/mods/ITEMS/mcl_potions/splash.lua b/mods/ITEMS/mcl_potions/splash.lua
index 95efa8bde..0f60342df 100644
--- a/mods/ITEMS/mcl_potions/splash.lua
+++ b/mods/ITEMS/mcl_potions/splash.lua
@@ -196,3 +196,11 @@ register_splash("water_breathing_plus", "Splash Fire Resistance", "#D0A040", {
 register_splash("water_breathing_plus", "Splash Fire Resistance +", "#E0B050", {
 	potion_fun = function(player, redx) mcl_potions.fire_resistance_func(player, 360*redx) end
 })
+
+register_splash("night_vision", "Splash Night Vision", "#009999", {
+	potion_fun = function(player, redx) mcl_potions.night_vision_func(player, 135*redx) end
+})
+
+register_splash("night_vision_plus", "Splash Night Vision +", "#000A0A", {
+	potion_fun = function(player, redx) mcl_potions.night_vision_func(player, 360*redx) end
+})
diff --git a/mods/ITEMS/mcl_potions/textures/hb_potion_bar.png b/mods/ITEMS/mcl_potions/textures/hb_potion_bar.png
deleted file mode 100644
index ce0aa78ec1e360bc7bc00c81028a6d6b176887fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^Oh7Ea0U|e_vV07r7>k44ofy`glX(f`h<ds>hHzX@
lj@h54$;`|w48*Y-43Ddr6zpEx`vDa&c)I$ztaD0e0suGc6juNM

diff --git a/mods/ITEMS/mcl_potions/textures/hb_swiftness_bgicon.png b/mods/ITEMS/mcl_potions/textures/hb_swiftness_bgicon.png
deleted file mode 100644
index b01f148599a6e7b1d4f79afa58a8842f0b8841e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1157
zcmds#v1*i25QWdO5t3j6S|&({t>x4f$}aALY(kPIT|k^7m7<kc30qhQHWu>`3Tk63
z*a%Yz;+v$Md~=_`%EAl(zs%ly&wS_1|MqzGXlHwGThh*QF+1URtDns&?>|RZccrP0
zAD_)BC6inVDW&SlOy;tXrL20>P44oLr@Z=Xn8FpINJaJ4G^Hy;naV;*Whz&NDpeF{
zBaIf9IbGeSmz#xInpL-@ayJk2G_R&$Gu$F9(xMuQv+0&$nU)13SFPMCtkR0EP$LF3
zlwh$(W3-V*i_6u9x@LuYx>x(7Emed^dQ{tmg3S!i^eo&1#aXZLN-yk@2bkO@4*Uaw
zL#Po08cL4BL1VO$Myoox-lk?{M0Jq(qb*ftWRWX&p<pvAqsWn@2>>pR6Etp#l03lV
zHgUj&VH`q@7|`4V3l18ijdb;h`ZU|rtYTsWi9gy>WmOMwjK3+yM0=iNNDVb|@9~Z(
zn{lMm(;kK!d3fmI53F`DIw8&Hz?29NPovfN694(@>8sawq={ahtWLrBFW29Oy8kmS
zIlJ|2asEQu{n5|l!@b>o{ybRD9-M8)lW&vh&5JL$zF%&9-aFKK{eJ%Y`E-3lUl;e^
T{kr{eqkApqtJ$ZA7jLcs;?Oys

diff --git a/mods/ITEMS/mcl_potions/textures/hb_swiftness_icon.png b/mods/ITEMS/mcl_potions/textures/hb_swiftness_icon.png
deleted file mode 100644
index 5c85ae17799a58b96bcccee6585d29709b44772e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1167
zcmds#v1*i25QWcX3pc@}u}esyo!AJ2*lI{H3$iY23eyGDDXc;?jarF~t)MV3A=t&<
zLSeAA^D%74Z|)OVS$N_9m)U#oneUwW-z^vSHaE66ByG+Q_gDO`_cNRF{`uhdHEF8l
z{i6d)$t0ITN~yXslesKpDXZRele;|RDX%^orf@|lQc-<1P3g)|rm|2{naWk6N)-j#
zNTbDNPFMHo<z``)X4P$}+|9#0&8sQc47Ui2w5W#SY`SGwre(p%RV%j&tF)pk)QABM
zC0Ojy7;U7{;&Qd2u36!p?$!QiOBLaf9@TcCU^BxrJq!0han>um(hGa!0VcPJ1OGta
z5NgDLhLWRj&=_r`(W*|ax2ahfQ5_`yXiJqDS>%dcDA<h3C~_oe0)UI-1dUswBo8pT
zO&l;`7>7_J1~fOpf`i6rBV9eBKFu~YtC$!;;*YjeS=9p^<8O*F(VpiRQbUd0d%Ppc
zW*q7Cw1?qF9v*u51FId3PDt}PFeSpn(`Yrm#DD&J`ttRzG|`LI;vpFS<@(!DcfQ9n
z&aR&x9zU11zV<WuaARwSKd;aC?;g$K@x^3%`D8Ww@&3x%=eKwC?a9T}OKW>)H_y*b
d&rf%6FCS@pa_jilmyfTy>-=D`|7q{!%^xOIJbeHF

diff --git a/mods/ITEMS/mcl_potions/textures/mcl_potions_healing.png b/mods/ITEMS/mcl_potions/textures/mcl_potions_healing.png
deleted file mode 100644
index 66bdbe0065be22e8cb94da875e61db61ee8da2bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1261
zcmds#y=#+E6vj_Xs%a%1vf0p3{D6vr;z4jwNhQTpN({9_9fX4PAa$wOK~zvgs7e)!
z8aUw4!O0<mpdex?QpArVNGG8#5;Hpa(ZS*Pock9zIe6iH!^yq(Ilt#Q@6AU2XrZUC
zhlmOzwdxpt2ja<R@vc6)^_nP4jnVO8ltfG<L`q~t9u+gO5G%0}du$4m2#JyyiN{%G
zQXy4RBlWmyOeSPXW@HW}awZpYB{y;u(1tX$a2cmP`ot1uWj1Dywx~o{l*L#)D6px*
zs;tK90fn<BY|3VA4n|yM7j|Vgc60?b!~hLSU||o9p$%zh;j)LJsIgSUL_GYVEh<$}
z6ZNnQ3T&E+nV7>ppm0`P#Z4UckOwev8*#utAm9+x5Cb$QaTFYA3~fk5%OkniMvY~v
z9znt%+M+U3bL0xUpuncOsUt@ujR3%f;|LmV5hd~fCT=4RFu^b!f*N9g#!X;>1C5~#
zX^#=bX>6m$a!d?C!XMhAGWQr@8h=oviN-wBkOC^@9^*|>24hMmrkxB2a`F(vPgvm~
zb%HcL2TTd!!Bc9LzQlk2n!0$opD07KWAzij_%GMrhFW^7(>U8bQ#*N{sCOlv%!6IM
zCHy%zQXLvUaQo%zi^B5We6F!)%k$HBXP3GsuHPA2-O*lYPA$Cp+O91%=W;h@4sIXa
zwDzoZ<!bHN`wjEiN^YR9tGe~!wqiSfrc+#gb7`_uEd3~bT7P%{+r**8&)G`msh0<T
zFaA7xxVic9xyss?^5A-A;ls!NCz)TB`Oc~7*75J<3rh8S`!<&M@7&!Lo<@f2)z*>8
GYkvT-_G^3q

diff --git a/mods/ITEMS/mcl_potions/textures/mcl_potions_night_vision.png b/mods/ITEMS/mcl_potions/textures/mcl_potions_night_vision.png
deleted file mode 100644
index 9a4ee688c9394bacd4292c0ad7e2fa430e357b89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1260
zcmds#(Tj{>6vofAX=lgIxZr}FmfahrQKpUyYSpr{cBZsVYqq!$g`<_CY>KE|7ecwz
zbnaGBBAW}lMX61jrB2kAB3WC?g$pYsMbq(|_b+he!du@roq6B)Ilt#Q-?jSiP(Ig{
zBcgn*S{cD_PdwQ+yeqe_KPPIV`o6{>N+Ko_A|)~+kBXUCh?UrgJvN0&ghWY<#N(_o
zsgNqEk$PM;CKECxGctz~Ig<;yk{dY+XhRxWxQx>tePRi-G8?l;TT~(}%3>@Y6xdW@
zRaRs5fWlc5Hf1w52P3Ys3%jx#JGz1zVt@uEu&{^5(1tX$aM{C9)L1HFA|C$G7L}@~
ziF()t1vX8^Ow8dPP&g~D;wBDz$OD+TjX2;R5O4@;hyfauI0_ClhBl<3<&j)$qsB5-
zk09X>ZBd!2IdX+vP+(Kt)R7~SMgZW#aRd#wh!S}K6Solum|z$VK@BlL<0i1cfyU5=
zw8x0zG`3M=IVOf6;SX(5nR^T{jXx;TL}Q+5NCA~{kMX7`gE6HO(@us1IeCcTC#-Og
zIzbwr1Ez%V;3>6AU*bQ19lvm~n<zu$Bg6ZF@n5dL4Yl}EPvUIHnd-r_M1}cyGB-<w
zBL2KmtL$#<xbbvxS8lGHU9~)MV(YuU>TKWZPluk&EQ}3g&s}ZRdQbmY+vxl~@NE3y
z^p;lU-p*~S%LN*pIKQrZe{sW`^+WxoChc8nD>dIveVm&e-F$4}OXk)_%H3`K?0?bz
z;P9)XkEgoYA9a77tZyp6@BGkP>{&B^VCl~1U)xtEn;pw^>HEyew`~4YSgH*USElzI
Gx%>wc!)$*5

diff --git a/mods/ITEMS/mcl_potions/textures/mcl_potions_swiftness.png b/mods/ITEMS/mcl_potions/textures/mcl_potions_swiftness.png
deleted file mode 100644
index 4dbf788a61fd9379fceb236ecc919e1f3ffdd65b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1262
zcmds#v1^lI5XLW!k{V1D2N7GPZbDqjE#e?5sck?@jD;dth@v+HheFjsS|}n?#bO6b
zI1yB^qJn~pU24f7)#AAbh2WrrlMXsKWDq@{d;bC_2VeNUaCzVNx!?2Lcda@+SjcbB
z6H%cuRIcH-FP`o!-sK0^SBSDyJu)(Yl8A|fNQsQdqhcl&VkI_Wk4<3`AyE<|@i?nY
zDx^wkq#jp|$%IVFjLe}#&g4R_<VKDH+K`48F5|REpIE}I%*O1|7L^E#vKWg81vXV!
zmDN~1pm5fNP1%gi!HBEu!mjMbj;^4F7@$E3EbO5%v>^>GT=p;&HI|B)h=)J4MWrfg
zq8@fZflX5}6LYu+6wZpPxQW9a@&G1oBM$fn1RR1IVt@uEj)DV?p$%zhc_bIxsIg4d
zBS`o|TU2Ihj$C0E6xdWZb>xVo5dgSw96`e^qC_6R#BIa@CK!f8P(uvRxCtz9pfR)|
z?J=S_jcwFej)@^i_(NM%<{kq~;}427(U@l%Qb48LW4tNKU`*-6w3FdLP99?T2`e0=
zPLRgufGHt7cuK9(m-x?LXD?0eAj;7B+VF8;{Fm!*L+x4B2F`96A38BXRD2arX1-MH
z!Jjjg^1+e4voGJjE42E$*Vmi%E@>?F&nzxawHFpI-f7&ppZjw2=;Y}BEqzx$?>e=w
z{o>YdTDvf|wcbllrr+$|d~Bh2ZQJ01Qj-pU%$Az%d!Jg%qbp}#f6YAHN%=>=I@7DU
zr+0rmKUtm4ekgXPA8#t3yZUXeFqb>M=X-5p>UO8~cHMZ_&+JlZzJF|En5qm6m!BP~
GU;YD}6mCfX

diff --git a/mods/ITEMS/mcl_potions/textures/mcl_potions_weakness.png b/mods/ITEMS/mcl_potions/textures/mcl_potions_weakness.png
deleted file mode 100644
index 524ebeea6aa747c33bfc685e2cd55aac676e3ebe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1260
zcmds#y=zoa5XEQn2quB7f=zUdZebx<q!<)Y6rvm4MOnhSO)$!;IH*_{qk<pA#RQ{*
zb}6P)v{3v&ML~kXf|3vz8yoQhMLQe8Lcs`*XYOBMW#NVQmf3snncq3{E)G_=c6Tl9
zBBJg}xm3e%F`kYL@6wG+Gej8;Zm$oZBw`{VQX(VrsF;a`Sc#3;V^f$!NR-4#JkBbU
z3aOGBsmE1gG9gnkBXcN`Gr5o}xsjuQHl(42%Q)@PCzdcPvoU+LMJ2+bEXLwNflU=w
zWi?h0D4aE6Q#NCBFybn^uq(T<qbsN(253+M3wvk`ZAe24mpu$cjin+c;^7Z%QK^cW
zsE1upVAE90#2oGcg|p%+ZsM?qJb;PYhy(rs0f(T57@$Fkqu@YeXhRxW9?8WvYAjRr
z2onC#7L}QrBUji31vb@99XTRt1OP4^N6>JKD3J#+aT{@f35MYi)DQzSZUPG&Xbf#g
zdyFVfV;eP=V`2yr{?HbcxyJz0_=6%%H0GIx6i_Mm7;lO)7*jei?PNHRlZP07!U_ke
z6QuDuU`hxNo>HsyCI0i*{!?dqiE?zTR^0)N|8o6psD(K_gtMJT%0r_>`4{ozrdH<*
z`15?F)L&nB`Pr+D`Bt%`z0vpP$w>PNo&WlL*YxArTQfcD%V!UN-ubiKTy$k};!ERQ
zZ9c2NK0eeOp_^@`>&^1iXno(Z+}+`}o|6mj4DTHu%YN<F`@OdpOq`}wSATrW_N;g`
zHaB~;e@*_thWFX0O~r>xrnjtZEx+*K>9&{O4}Qq{7PmSJE5A+t9)Ei+EL8@orF)wj
G=l%evV{E$s