From b674e743874d3fbe4a40666ae2b1b4c9aa92542e Mon Sep 17 00:00:00 2001
From: bzoss <brandonzoss@gmail.com>
Date: Tue, 9 Jun 2020 20:09:32 -0400
Subject: [PATCH] Correct redstone alias and Add poison and regeneration
 potions - THESE DON'T CURRENTLY WORK

---
 mods/ITEMS/mcl_brewing/init.lua               |  14 +-
 .../mcl_brewing/textures/mcl_brewing_side.png | Bin 404 -> 392 bytes
 mods/ITEMS/mcl_potions/init.lua               | 192 ++++++++++++++++--
 3 files changed, 187 insertions(+), 19 deletions(-)

diff --git a/mods/ITEMS/mcl_brewing/init.lua b/mods/ITEMS/mcl_brewing/init.lua
index 696e0af12..4e93d8792 100755
--- a/mods/ITEMS/mcl_brewing/init.lua
+++ b/mods/ITEMS/mcl_brewing/init.lua
@@ -341,6 +341,18 @@ local allow_take = function(pos, listname, index, stack, player)
 end
 local on_take = function(pos, listname, index, stack, player)
 	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+	local str = ""
+	for i=1, inv:get_size("stand") do
+		local stack = inv:get_stack("stand", i)
+		if not stack:is_empty() then
+			str = str.."1"
+		else str = str.."0"
+		end
+	end
+	minetest.swap_node(pos, {name = "mcl_brewing:stand_"..str})
+	minetest.get_node_timer(pos):start(1.0)
+	--some code here to enforce only potions getting placed on stands
 end
 
 minetest.register_node("mcl_brewing:stand_000", {
@@ -429,7 +441,7 @@ minetest.register_node("mcl_brewing:stand_000", {
 	on_timer = brewing_stand_timer,
 	on_rotate = on_rotate,
 })
-minetest.register_alias("mcl_brewing:stand_000", "mcl_brewing:stand")
+minetest.register_alias("mcl_brewing:stand", "mcl_brewing:stand_000")
 minetest.register_node("mcl_brewing:stand_100", {
 	description = S("Brewing Stand"),
 	_doc_items_longdesc = S("The stand allows you to brew potions!"),
diff --git a/mods/ITEMS/mcl_brewing/textures/mcl_brewing_side.png b/mods/ITEMS/mcl_brewing/textures/mcl_brewing_side.png
index 7793eae65f8c60e3f53bd777393265ccf6fafc7e..057a405e0b90e9fd1a7307bae5fdb548bb8765da 100644
GIT binary patch
delta 344
zcmV-e0jK_y1Be5VIe$7yL_t(IjfIlGP69y?#(zhSz=c0H7wCM6djLtSAi35MAK-dT
z)W$?RBPRCn0OlGiB2*f9fUBV(7IYXwBZk;GR=c^q<Bn-&zWu)Wc6KusiI_|#qUw|H
z7XYTUbIrF}Ei2h$G{+5O5sCyz7QfdZjwL{(?@6Afkm&~C2Y+ySl`Am}mZJ-UjE2DM
zgFKBkn9lwro&h``qG6vrjgFh=H;HEe>3brJQ1Uc|<bi>`0D4`0d#Bw_Yxa$#umtD{
zvNX0jc)bhL@461*{fRtH0bn#9r+RfnQ8ve+J?M48^9~!tKgXCTwn)h-6}B}vs%fJR
z@OTN9Kd@k+n^D~ES<1|MxWAR-rpt1*Hf~t0zi7G*jjK+H?e5p$>*WgeZu`T=DQSVq
qO}9bSDKVda0#K|Jsh2C-K-K@~s;s=D6?bC*0000<MNUMnLSTZPBBId%

delta 356
zcmV-q0h|7a1C#@hIe$h;L_t(IjeU|oPr_gj#(yOcXbQMA5FPvyO<e5?iK|fuM|O2^
zF=?5MCc4W9FfNYLwd^*IGC43vFvLX+aq)GbFTMWpmiMmr+;h)e&md)C7^>Lc{kjKW
z)Hu?4*L96_jVMkM_&&;aQAK%xQkq0`2*Epa{_S2almmEYy?>P#6=H;f$?!xZ`!|D3
zK^mh8Mz6mr`Nj(R(V8R=qX~vV!148qF${t={kxQ&hbaM^-#&@W>e%T)xbEKVbh4PV
zq-3molzP6)$WF%kFFbk=0sz3K1Bo5vVaoArJDF<ePa{1-k!21^SSSyvkRZ97SP`ra
zY0DAc(ilAg8(j@e)CI0i!Ppy!)3p!wGi1i4f1$S9Hj~+0bePRQXxl9v*Uc)6<&VfW
zYZm3@;+s#issZuawp-NAD&z4R02Ql3vu0_6*#83#1)q*%nx%XI0000<MNUMnLSTYZ
CIH%(P

diff --git a/mods/ITEMS/mcl_potions/init.lua b/mods/ITEMS/mcl_potions/init.lua
index a88be31c4..c5273bcd2 100644
--- a/mods/ITEMS/mcl_potions/init.lua
+++ b/mods/ITEMS/mcl_potions/init.lua
@@ -634,6 +634,142 @@ minetest.register_craftitem("mcl_potions:weakness", {
 	end
 })
 
+local poison_func = function(player, factor, duration)
+	player:set_attribute("poison", tostring(factor))
+	print(player:get_player_name().." ".."poison = "..player:get_attribute("poison"))
+	minetest.after(duration, function() player:set_attribute("poison", tostring(0)) end )
+end
+minetest.register_craftitem("mcl_potions:poison", {
+	description = S("Poison Potion"),
+	_doc_items_longdesc = brewhelp,
+	wield_image = potion_image("#225533"),
+	inventory_image = potion_image("#225533"),
+	groups = { brewitem = 1, food = 0 },
+	stack_max = 1,
+
+	on_place = function(itemstack, user, pointed_thing)
+		poison_func(user, 2.5, 45)
+		_use_potion()
+		return itemstack
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		poison_func(user, 2.5, 45)
+		_use_potion()
+		return itemstack
+	end
+})
+
+minetest.register_craftitem("mcl_potions:poison_2", {
+	description = S("Poison Potion II"),
+	_doc_items_longdesc = brewhelp,
+	wield_image = potion_image("#447755"),
+	inventory_image = potion_image("#447755"),
+	groups = { brewitem = 1, food = 0 },
+	stack_max = 1,
+
+	on_place = function(itemstack, user, pointed_thing)
+		poison_func(user, 1.2, 21)
+		_use_potion()
+		return itemstack
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		poison_func(user, 1.2, 21)
+		_use_potion()
+		return itemstack
+	end
+})
+
+minetest.register_craftitem("mcl_potions:poison_plus", {
+	description = S("Poison Potion +"),
+	_doc_items_longdesc = brewhelp,
+	wield_image = potion_image("#336644"),
+	inventory_image = potion_image("#336644"),
+	groups = { brewitem = 1, food = 0 },
+	stack_max = 1,
+
+	on_place = function(itemstack, user, pointed_thing)
+		poison_func(user, 2.5, 90)
+		_use_potion()
+		return itemstack
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		poison_func(user, 2.5, 90)
+		_use_potion()
+		return itemstack
+	end
+})
+
+local regeneration_func = function(player, factor, duration)
+	player:set_attribute("regeneration", tostring(factor))
+	print(player:get_player_name().." ".."regeneration = "..player:get_attribute("regeneration"))
+	minetest.after(duration, function() player:set_attribute("regeneration", tostring(0)) end )
+end
+minetest.register_craftitem("mcl_potions:regeneration", {
+	description = S("Regeneration Potion"),
+	_doc_items_longdesc = brewhelp,
+	wield_image = potion_image("#A52BB2"),
+	inventory_image = potion_image("#A52BB2"),
+	groups = { brewitem = 1, food = 0 },
+	stack_max = 1,
+
+	on_place = function(itemstack, user, pointed_thing)
+		regeneration_func(user, 2.5, 45)
+		_use_potion()
+		return itemstack
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		regeneration_func(user, 2.5, 45)
+		_use_potion()
+		return itemstack
+	end
+})
+
+minetest.register_craftitem("mcl_potions:regeneration_2", {
+	description = S("Regeneration Potion II"),
+	_doc_items_longdesc = brewhelp,
+	wield_image = potion_image("#B52CC2"),
+	inventory_image = potion_image("#B52CC2"),
+	groups = { brewitem = 1, food = 0 },
+	stack_max = 1,
+
+	on_place = function(itemstack, user, pointed_thing)
+		regeneration_func(user, 1.2, 21)
+		_use_potion()
+		return itemstack
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		regeneration_func(user, 1.2, 21)
+		_use_potion()
+		return itemstack
+	end
+})
+
+minetest.register_craftitem("mcl_potions:regeneration_plus", {
+	description = S("Regeneration Potion +"),
+	_doc_items_longdesc = brewhelp,
+	wield_image = potion_image("#C53DD3"),
+	inventory_image = potion_image("#C53DD3"),
+	groups = { brewitem = 1, food = 0 },
+	stack_max = 1,
+
+	on_place = function(itemstack, user, pointed_thing)
+		regeneration_func(user, 2.5, 90)
+		_use_potion()
+		return itemstack
+	end,
+
+	on_secondary_use = function(itemstack, user, pointed_thing)
+		regeneration_func(user, 2.5, 90)
+		_use_potion()
+		return itemstack
+	end
+})
+
 -- Look into reducing attack on punch
 minetest.register_on_punchnode(function(pos, node, puncher, pointed_thing)
 	if puncher:get_attribute("weakness") then
@@ -672,7 +808,7 @@ function register_splash(name, descr, color, def)
           local pos = self.object:getpos()
           local node = minetest.get_node(pos)
           local n = node.name
-					local d = 1.5
+					local d = 2
           if n ~= "air" then
 						minetest.sound_play("mcl_potions_breaking_glass")
 						minetest.add_particlespawner({
@@ -693,7 +829,7 @@ function register_splash(name, descr, color, def)
 																				texture = "mcl_potions_sprite.png^[colorize:"..color..":127",
 																			})
             self.object:remove()
-						for i, obj in ipairs(minetest.get_objects_inside_radius(pos, 2)) do
+						for i, obj in ipairs(minetest.get_objects_inside_radius(pos, 3)) do
 							if minetest.is_player(obj) then def.potion_fun(obj) end
 						end
 					end
@@ -749,7 +885,29 @@ register_splash("slowness_plus", "Splash Slowness +", "#000066", {
 		potion_fun = function(player) swiftness_func(player, 0.85, 180) end
 })
 
+register_splash("poison", "Splash Poison", "#335544", {
+		potion_fun = function(player) poison_func(player, 0.85, 180) end
+})
 
+register_splash("poison_2", "Splash Poison II", "#446655", {
+		potion_fun = function(player) poison_func(player, 0.85, 180) end
+})
+
+register_splash("poison_plus", "Splash Poison II", "#557766", {
+		potion_fun = function(player) poison_func(player, 0.85, 180) end
+})
+
+register_splash("regeneration", "Splash Regeneration", "#A52BB2", {
+		potion_fun = function(player) regeneration_func(player, 0.85, 180) end
+})
+
+register_splash("regeneration_2", "Splash Regeneration II", "#B52CC2", {
+		potion_fun = function(player) regeneration_func(player, 0.85, 180) end
+})
+
+register_splash("regeneration_plus", "Splash Regeneration +", "#C53DD3", {
+		potion_fun = function(player) regeneration_func(player, 0.85, 180) end
+})
 -- duration effects of redstone are a factor of 8/3
 -- duration effects of glowstone are a time factor of 1/2 and effect of 14/12
 -- splash potion effects are reduced by a factor of 3/4
@@ -777,17 +935,20 @@ local output_table = {
 	["mcl_potions:potion_awkward"] = awkward_table,
 }
 
-local enhancement_table = {
-	["mcl_potions:healing"] = "mcl_potions:healing_2",
-	["mcl_potions:harming"] = "mcl_potions:harming_2",
-	["mcl_potions:swiftness"] = "mcl_potions:swiftness_2",
-	["mcl_potions:leaping"] = "mcl_potions:leaping_2",
-}
 
-local extension_table = {
-	["mcl_potions:swiftness"] = "mcl_potions:swiftness_plus",
-	["mcl_potions:leaping"] = "mcl_potions:leaping_plus",
-}
+local enhancement_table = {}
+local extension_table = {}
+local potions = {}
+for i, potion in ipairs({"healing","harming","swiftness","leaping","poison","regeneration"}) do
+    enhancement_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_2"
+		table.insert(potions, potion)
+		table.insert(potions, potion.."_2")
+		if potion ~= "healing" and potion ~= "harming" then
+			extension_table["mcl_potions:"..potion] = "mcl_potions:"..potion.."_plus"
+			table.insert(potions, potion.."_plus")
+		end
+end
+
 
 local inversion_table = {
 	["mcl_potions:healing"] = "mcl_potions:harming",
@@ -800,11 +961,6 @@ local inversion_table = {
 	["mcl_potions:leaping_plus"] = "mlc_potions:slowness_plus",
 }
 
-local potions = {"healing", "healing_2",
-	 							 "harming", "harming_2", "slowness", "slowness_plus",
-								 "leaping", "leaping_2", "leaping_plus",
-								 "swiftness", "swiftness_2", "swiftness_plus",
-							 }
 
 local splash_table = {}
 
@@ -813,7 +969,7 @@ for i, potion in ipairs(potions) do
 end
 
 local mod_table = {
-	["mesecons:redstone"] = extension_table,
+	["mesecons:wire_00000000_off"] = extension_table,
 	["mcl_potions:fermented_spider_eye"] = inversion_table,
 	["mcl_nether:glowstone_dust"] = enhancement_table,
 	["mcl_mobitems:gunpowder"] = splash_table,