From 379dd847eedc1c93a28be53ca4a6c1504cc2382e Mon Sep 17 00:00:00 2001
From: Rootyjr <41842051+Rootyjr@users.noreply.github.com>
Date: Tue, 30 Jul 2019 21:22:28 -0500
Subject: [PATCH 1/7] Completely rework fishing rod to simulate a much more
 MC-like behaviour

---
 mods/ITEMS/mcl_fishing/init.lua               | 309 +++++++++++++++++-
 .../textures/mcl_fishing_bobber.png           | Bin 0 -> 2281 bytes
 .../textures/mcl_fishing_fishing_rod.png      | Bin 299 -> 2397 bytes
 mods/ITEMS/mcl_throwing/init.lua              |  45 +++
 4 files changed, 342 insertions(+), 12 deletions(-)
 create mode 100644 mods/ITEMS/mcl_fishing/textures/mcl_fishing_bobber.png

diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua
index 0c23daae..0d34779d 100644
--- a/mods/ITEMS/mcl_fishing/init.lua
+++ b/mods/ITEMS/mcl_fishing/init.lua
@@ -1,4 +1,9 @@
 local S = minetest.get_translator("mcl_fishing")
+local mod_throwing = minetest.get_modpath("mcl_throwing")
+
+local entity_mapping = {
+	["mcl_fishing:bobber"] = "mcl_fishing:bobber_entity",
+}
 
 local go_fishing = function(itemstack, user, pointed_thing)
 	if pointed_thing and pointed_thing.under then
@@ -83,26 +88,308 @@ local go_fishing = function(itemstack, user, pointed_thing)
 	return nil
 end
 
+local bobber_ENTITY={
+	physical = false,
+	timer=0,
+	textures = {"mcl_fishing_bobber.png"},
+	visual_size = {x=0.5, y=0.5},
+	collisionbox = {0.45,0.45,0.45,0.45,0.45,0.45},
+	pointable = false,
+
+	get_staticdata = get_staticdata,
+	on_activate = on_activate,
+
+	_lastpos={},
+	_dive = false,
+	_waittick = nil,
+	_tick = 0,
+	player=nil,
+	_oldy = nil,
+	objtype="fishing",
+}
+
+local fish = function(itemstack, player)
+		local pos = player:get_pos()
+
+		local objs = minetest.get_objects_inside_radius(pos, 250)
+		local num = 0
+		local ent = nil
+		local noent = true
+		
+		--Check for bobber if so handle.
+		for n = 1, #objs do
+			ent = objs[n]:get_luaentity()
+			if ent then
+				if ent.player and ent.objtype=="fishing" then
+					if (player:get_player_name() == ent.player) then
+						noent = false
+						if ent._dive == true then
+							local itemname
+							local itemcount = 1
+							local itemwear = 0
+							-- FIXME: Maybe use a better seeding
+							local pr = PseudoRandom(os.time() * math.random(1, 100))
+							local r = pr:next(1, 100)
+							if r <= 85 then
+								-- Fish
+								items = mcl_loot.get_loot({
+									items = {
+										{ itemstring = "mcl_fishing:fish_raw", weight = 60 },
+										{ itemstring = "mcl_fishing:salmon_raw", weight = 25 },
+										{ itemstring = "mcl_fishing:clownfish_raw", weight = 2 },
+										{ itemstring = "mcl_fishing:pufferfish_raw", weight = 13 },
+									}
+								}, pr)
+							elseif r <= 95 then
+								-- Junk
+								items = mcl_loot.get_loot({
+									items = {
+										{ itemstring = "mcl_core:bowl", weight = 10 },
+										{ itemstring = "mcl_fishing:fishing_rod", weight = 2, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
+										{ itemstring = "mcl_mobitems:leather", weight = 10 },
+										{ itemstring = "3d_armor:boots_leather", weight = 10, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
+										{ itemstring = "mcl_mobitems:rotten_flesh", weight = 10 },
+										{ itemstring = "mcl_core:stick", weight = 5 },
+										{ itemstring = "mcl_mobitems:string", weight = 5 },
+										{ itemstring = "mcl_potions:potion_water", weight = 10 },
+										{ itemstring = "mcl_mobitems:bone", weight = 10 },
+										{ itemstring = "mcl_dye:black", weight = 1, amount_min = 10, amount_max = 10 },
+										{ itemstring = "mcl_mobitems:string", weight = 10 }, -- TODO: Tripwire Hook
+									}
+								}, pr)
+							else
+								-- Treasure
+								items = mcl_loot.get_loot({
+									items = {
+										-- TODO: Enchanted Bow
+										{ itemstring = "mcl_bows:bow", wear_min = 49144, wear_max = 65535 }, -- 75%-100% damage
+										-- TODO: Enchanted Book
+										{ itemstring = "mcl_books:book" },
+										-- TODO: Enchanted Fishing Rod
+										{ itemstring = "mcl_fishing:fishing_rod", wear_min = 49144, wear_max = 65535 }, -- 75%-100% damage
+										{ itemstring = "mcl_mobs:nametag", },
+										{ itemstring = "mcl_mobitems:saddle", },
+										{ itemstring = "mcl_flowers:waterlily", },
+									}
+								}, pr)
+							end
+							local item
+							if #items >= 1 then
+								item = ItemStack(items[1])
+							else
+								item = ItemStack()
+							end
+							local inv = player:get_inventory()
+							if inv:room_for_item("main", item) then
+								inv:add_item("main", item)
+							end
+							if not minetest.settings:get_bool("creative_mode") then
+								local idef = itemstack:get_definition()
+								itemstack:add_wear(65535/65) -- 65 uses
+								if itemstack:get_count() == 0 and idef.sound and idef.sound.breaks then
+									minetest.sound_play(idef.sound.breaks, {pos=player.get_pos(), gain=0.5})
+								end
+							end
+						end
+						--Check if object is on land.
+						local epos = ent.object:get_pos()
+						epos.y = math.floor(epos.y)
+						local node = minetest.get_node(epos)
+						local def = minetest.registered_nodes[node.name]
+						if def.walkable then
+							if not minetest.settings:get_bool("creative_mode") then
+								local idef = itemstack:get_definition()
+								itemstack:add_wear((65535/65)*2) -- if so and not creative then wear double like in MC.
+								if itemstack:get_count() == 0 and idef.sound and idef.sound.breaks then
+									minetest.sound_play(idef.sound.breaks, {pos=player.get_pos(), gain=0.5})
+								end
+							end
+						end
+						--Destroy bobber.
+						ent.object:remove()
+						return itemstack
+					end
+				end
+			end
+		end
+		--Check for flying bobber.
+		for n = 1, #objs do
+			ent = objs[n]:get_luaentity()
+			if ent then
+				if ent._thrower and ent.objtype=="fishing" then
+					if player:get_player_name() == ent._thrower then
+						noent = false
+						break
+					end
+				end
+			end
+		end
+		--If no bobber or flying_bobber exists then throw bobber.
+		if noent == true then
+			local playerpos = player:get_pos()
+			local dir = player:get_look_dir()
+			local obj = mcl_throwing.throw("mcl_throwing:flying_bobber", {x=playerpos.x, y=playerpos.y+1.5, z=playerpos.z}, dir, 15)
+			obj:get_luaentity()._thrower = player:get_player_name()
+		end
+end
+
+-- Movement function of bobber
+local bobber_on_step = function(self, dtime)
+	self.timer=self.timer+dtime
+	local epos = self.object:get_pos()
+	epos.y = math.floor(epos.y)
+	local node = minetest.get_node(epos)
+	local def = minetest.registered_nodes[node.name]
+	
+	--If we have no player remove self.
+	if self.player == nil then
+		self.object:remove()
+	end
+	
+	--Check if player is nearby
+	if self._tick % 5 == 0 and self.player ~= nil then
+		--Destroy bobber if item not wielded.
+		if (minetest.get_player_by_name(self.player):get_wielded_item():get_name() ~= "mcl_fishing:fishing_rod") then
+			self.object:remove()
+		end
+	
+		--Destroy bobber if player is too far away.
+		local objpos = self.object:get_pos()
+		local playerpos = minetest.get_player_by_name(self.player):get_pos()
+		if (((playerpos.y - objpos.y) >= 33) or ((playerpos.y - objpos.y) <= -33)) then
+			self.object:remove()
+		elseif (((playerpos.x - objpos.x) >= 33) or ((playerpos.x - objpos.x) <= -33)) then
+			self.object:remove()
+		elseif (((playerpos.z - objpos.z) >= 33) or ((playerpos.z - objpos.z) <= -33)) then
+			self.object:remove()
+		elseif ((((playerpos.z + playerpos.x) - (objpos.z + objpos.x)) >= 33) or ((playerpos.z + playerpos.x) - (objpos.z + objpos.x)) <= -33) then
+			self.object:remove()
+		elseif ((((playerpos.y + playerpos.x) - (objpos.y + objpos.x)) >= 33) or ((playerpos.y + playerpos.x) - (objpos.y + objpos.x)) <= -33) then
+			self.object:remove()
+		elseif ((((playerpos.z + playerpos.y) - (objpos.z + objpos.y)) >= 33) or ((playerpos.z + playerpos.y) - (objpos.z + objpos.y)) <= -33) then
+			self.object:remove()
+		end
+		
+	end
+	--if in liquid then bob.
+	if def.liquidtype == "source" then
+		if self._oldy == nil then
+			self.object:set_pos({x=self.object:get_pos().x,y=math.floor(self.object:get_pos().y)+.5,z=self.object:get_pos().z})
+			self._oldy = self.object:get_pos().y
+		end
+		minetest.log(self.object:get_pos().y.." "..self._oldy)
+		-- reset to original position after dive.
+		if self.object:get_pos().y > self._oldy then
+			self.object:set_pos({x=self.object:get_pos().x,y=self._oldy,z=self.object:get_pos().z})
+			self.object:set_velocity({x=0,y=0,z=0})
+			self.object:set_acceleration({x=0,y=0,z=0})
+		end
+		if self._dive then
+			for i=1,2 do
+					--spray bubbles there's a fish.
+					minetest.add_particle({
+						pos = {x=epos["x"]+math.random(-1,1)*math.random()/2,y=epos["y"]+0.1,z=epos["z"]+math.random(-1,1)*math.random()/2},
+						velocity = {x=0, y=4, z=0},
+						acceleration = {x=0, y=-5, z=0},
+						expirationtime = math.random(),
+						size = math.random()+0.5,
+						collisiondetection = true,
+						vertical = false,
+						texture = "mcl_particles_bubble.png",
+					})
+			end
+			if self._tick ~= self._waittick then
+				self._tick = self._tick + 1
+			else
+				self._waittick = nil
+				self._tick = 0
+				self._dive = false
+			end
+		else if self._waittick == nil then
+			--wait for random number of ticks.
+			self._waittick = math.random(50,800)
+		else
+			if self._tick ~= self._waittick then
+				self._tick = self._tick + 1
+			else
+				--wait time is over time to dive.
+				self._dive = true
+				self.object:set_velocity({x=0,y=-2,z=0})
+				self.object:set_acceleration({x=0,y=5,z=0})
+				self._waittick = 30
+				self._tick = 0
+			end
+		end
+	end
+end		
+
+	-- Destroy when hitting a solid node
+	--if self._lastpos.x~=nil then
+	--	if (def and def.walkable) or not def then
+			--self.object:remove()
+		--	return
+	--	end
+	--end
+	--self._lastpos={x=pos.x, y=pos.y, z=pos.z} -- Set lastpos-->Node will be added at last pos outside the node
+end
+
+bobber_ENTITY.on_step = bobber_on_step
+
+minetest.register_entity("mcl_fishing:bobber_entity", bobber_ENTITY)
+
+--If player leaves area remove bobber.
+minetest.register_on_leaveplayer(function(player)
+	local objs = minetest.get_objects_inside_radius(player:get_pos(), 250)
+	local num = 0
+	local ent = nil
+	local noent = true
+	
+	for n = 1, #objs do
+		ent = objs[n]:get_luaentity()
+		if ent then
+			if ent.player and ent.objtype=="fishing" then
+				ent.object:remove()
+			elseif ent._thrower and ent.objtype=="fishing" then
+				ent.object:remove()
+			end
+		end
+	end
+end)
+
+--if player dies remove bobber.
+minetest.register_on_dieplayer(function(player)
+	local objs = minetest.get_objects_inside_radius(player:get_pos(), 250)
+	local num = 0
+	local ent = nil
+	local noent = true
+	
+	for n = 1, #objs do
+		ent = objs[n]:get_luaentity()
+		if ent then
+			if ent.player and ent.objtype=="fishing" then
+				ent.object:remove()
+			elseif ent._thrower and ent.objtype=="fishing" then
+				ent.object:remove()
+			end
+		end
+	end
+end)
+
 -- Fishing Rod
 minetest.register_tool("mcl_fishing:fishing_rod", {
 	description = S("Fishing Rod"),
 	_doc_items_longdesc = S("Fishing rods can be used to catch fish."),
-	_doc_items_usagehelp = S("Rightclick a water source to try to go fishing. Who knows what you're going to catch?"),
+	_doc_items_usagehelp = S("Rightclick to launch the bobber. When it sinks right-click again to reel in an item. Who knows what you're going to catch?"),
 	-- This item is incomplete, hide it from creative inventory
-	groups = { tool=1, not_in_creative_inventory=1 },
+	groups = { tool=1},
 	inventory_image = "mcl_fishing_fishing_rod.png",
 	stack_max = 1,
-	liquids_pointable = true,
-	on_place = go_fishing,
+	on_place = fish,
+	on_secondary_use = fish,
 	sound = { breaks = "default_tool_breaks" },
 })
 
---[[
-
-Temporarily removed from crafting as the fishing rod is massively overpowered atm.
-
-TODO: Re-enable crafting when fishing rod has been improved.
-
+--Make fishing rods craftable again.
 minetest.register_craft({
 	output = "mcl_fishing:fishing_rod",
 	recipe = {
@@ -119,8 +406,6 @@ minetest.register_craft({
 		{'mcl_mobitems:string','','mcl_core:stick'},
 	}
 })
-]]
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "mcl_fishing:fishing_rod",
diff --git a/mods/ITEMS/mcl_fishing/textures/mcl_fishing_bobber.png b/mods/ITEMS/mcl_fishing/textures/mcl_fishing_bobber.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c93fd4f9009a8d22f4cee482f1f6ed2a425b57a
GIT binary patch
literal 2281
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
E0GQcUbN~PV

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_fishing/textures/mcl_fishing_fishing_rod.png b/mods/ITEMS/mcl_fishing/textures/mcl_fishing_fishing_rod.png
index f8b4f871498da37a2f57fb78e0030a5b17a4e7ff..2fbcc73445a20508c2283c2365f16e23f681663f 100644
GIT binary patch
delta 2387
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
HoD!M<+8Bvn

delta 273
zcmcaBw3=yxay`Q*PZ!6K3dZCcGjmUW`2W9tli>}9AcqCbFaJmQ&;G9>)o@{s+>=lH
zm#+Kszw__ve}{P#JU1_1`R)H(ZMDDq%ktDevNg<!k$B3tT~ftu3wOh|CR65EhHav1
zefL>8&Kk@<c#e(hptJmmcIk%GHw|VlJm;3d_A&cW?SqXCzQ%25>oc}JHe<+8_Au7i
zqG;yK;32Fiu3%zc`{}{|laJXS&Jtu($Z<DgP@Z>vedI5DYfHYv4X2~T{x9cznIO@y
zM$%Py7o)%Y-Cy<Zj^yz$J2bXA8!r=gV)}cLM`4ciLqmg|>mS<-Bug+nN;qn5rh7Ci
hq56J~g*3yOKV^@M<u9&hVBlh4@O1TaS?83{1OW6FdZGXT

diff --git a/mods/ITEMS/mcl_throwing/init.lua b/mods/ITEMS/mcl_throwing/init.lua
index 7205a17b..1c579bd8 100644
--- a/mods/ITEMS/mcl_throwing/init.lua
+++ b/mods/ITEMS/mcl_throwing/init.lua
@@ -2,6 +2,7 @@ mcl_throwing = {}
 
 local S = minetest.get_translator("mcl_throwing")
 local mod_death_messages = minetest.get_modpath("mcl_death_messages")
+local mod_fishing = minetest.get_modpath("mcl_fishing")
 
 -- 
 -- Snowballs and other throwable items
@@ -10,12 +11,14 @@ local mod_death_messages = minetest.get_modpath("mcl_death_messages")
 local GRAVITY = tonumber(minetest.settings:get("movement_gravity"))
 
 local entity_mapping = {
+	["mcl_throwing:flying_bobber"] = "mcl_throwing:flying_bobber_entity",
 	["mcl_throwing:snowball"] = "mcl_throwing:snowball_entity",
 	["mcl_throwing:egg"] = "mcl_throwing:egg_entity",
 	["mcl_throwing:ender_pearl"] = "mcl_throwing:ender_pearl_entity",
 }
 
 local velocities = {
+	["mcl_throwing:flying_bobber_entity"] = 5,
 	["mcl_throwing:snowball_entity"] = 22,
 	["mcl_throwing:egg_entity"] = 22,
 	["mcl_throwing:ender_pearl_entity"] = 22,
@@ -117,6 +120,22 @@ local pearl_ENTITY={
 	_thrower = nil,		-- Player ObjectRef of the player who threw the ender pearl
 }
 
+local flying_bobber_ENTITY={
+	physical = false,
+	timer=0,
+	textures = {"mcl_fishing_bobber.png"}, --FIXME: Replace with correct texture.
+	visual_size = {x=0.5, y=0.5},
+	collisionbox = {0,0,0,0,0,0},
+	pointable = false,
+
+	get_staticdata = get_staticdata,
+	on_activate = on_activate,
+
+	_lastpos={},
+	_thrower = nil,
+	objtype="fishing",
+}
+
 -- Snowball on_step()--> called when snowball is moving.
 local snowball_on_step = function(self, dtime)
 	self.timer=self.timer+dtime
@@ -284,13 +303,39 @@ local pearl_on_step = function(self, dtime)
 	self._lastpos={x=pos.x, y=pos.y, z=pos.z} -- Set lastpos-->Node will be added at last pos outside the node
 end
 
+-- Movement function of flying bobber
+local flying_bobber_on_step = function(self, dtime)
+	self.timer=self.timer+dtime
+	local pos = self.object:get_pos()
+	local node = minetest.get_node(pos)
+	local def = minetest.registered_nodes[node.name]
+	--local player = minetest.get_player_by_name(self._thrower)
+
+	-- Destroy when hitting a solid node
+	if self._lastpos.x~=nil then
+		if (def and (def.walkable or def.liquidtype == "flowing" or def.liquidtype == "source")) or not def then
+			local make_child= function(object)
+				local ent = object:get_luaentity()
+				ent.player = self._thrower
+				ent.child = true
+			end
+			make_child(minetest.add_entity(self._lastpos, "mcl_fishing:bobber_entity"))
+			self.object:remove()
+			return
+		end
+	end
+	self._lastpos={x=pos.x, y=pos.y, z=pos.z} -- Set lastpos-->Node will be added at last pos outside the node
+end
+
 snowball_ENTITY.on_step = snowball_on_step
 egg_ENTITY.on_step = egg_on_step
 pearl_ENTITY.on_step = pearl_on_step
+flying_bobber_ENTITY.on_step = flying_bobber_on_step
 
 minetest.register_entity("mcl_throwing:snowball_entity", snowball_ENTITY)
 minetest.register_entity("mcl_throwing:egg_entity", egg_ENTITY)
 minetest.register_entity("mcl_throwing:ender_pearl_entity", pearl_ENTITY)
+minetest.register_entity("mcl_throwing:flying_bobber_entity", flying_bobber_ENTITY)
 
 local how_to_throw = S("Use the punch key to throw.")
 

From 3da1c551a1d9c3515914d56771051503b2a70ea7 Mon Sep 17 00:00:00 2001
From: Rootyjr <41842051+Rootyjr@users.noreply.github.com>
Date: Tue, 30 Jul 2019 22:24:27 -0500
Subject: [PATCH 2/7] Remove WIP and update descriptions.

---
 mods/ITEMS/mcl_fishing/depends.txt         | 1 +
 mods/ITEMS/mcl_fishing/locale/template.txt | 2 +-
 mods/ITEMS/mcl_mobitems/init.lua           | 3 ---
 mods/ITEMS/mcl_throwing/depends.txt        | 1 +
 mods/MISC/mcl_wip/init.lua                 | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mods/ITEMS/mcl_fishing/depends.txt b/mods/ITEMS/mcl_fishing/depends.txt
index 93ef0bf5..1fd904fe 100644
--- a/mods/ITEMS/mcl_fishing/depends.txt
+++ b/mods/ITEMS/mcl_fishing/depends.txt
@@ -2,3 +2,4 @@ mcl_core
 mcl_sounds
 mcl_loot
 mcl_mobs
+mcl_throwing
diff --git a/mods/ITEMS/mcl_fishing/locale/template.txt b/mods/ITEMS/mcl_fishing/locale/template.txt
index c958e0b4..d2bac980 100644
--- a/mods/ITEMS/mcl_fishing/locale/template.txt
+++ b/mods/ITEMS/mcl_fishing/locale/template.txt
@@ -1,7 +1,7 @@
 # textdomain: mcl_fishing
 Fishing Rod=
 Fishing rods can be used to catch fish.=
-Rightclick a water source to try to go fishing. Who knows what you're going to catch?=
+Rightclick to launch the bobber. When it sinks right-click again to reel in an item. Who knows what you're going to catch?=
 Raw Fish=
 Raw fish is obtained by fishing and is a food item which can be eaten safely. Cooking it improves its nutritional value.=
 Cooked Fish=
diff --git a/mods/ITEMS/mcl_mobitems/init.lua b/mods/ITEMS/mcl_mobitems/init.lua
index f2504311..8a670766 100644
--- a/mods/ITEMS/mcl_mobitems/init.lua
+++ b/mods/ITEMS/mcl_mobitems/init.lua
@@ -359,8 +359,6 @@ minetest.register_craft({
 	},
 })
 
---[[
-TODO: Re-enable this when fishing rod is available again
 minetest.register_craft({
 	output = "mcl_mobitems:carrot_on_a_stick",
 	recipe = {
@@ -376,7 +374,6 @@ minetest.register_craft({
 		{ "mcl_farming:carrot_item", "" },
 	},
 })
-]]
 
 minetest.register_craft({
 	type = "shapeless",
diff --git a/mods/ITEMS/mcl_throwing/depends.txt b/mods/ITEMS/mcl_throwing/depends.txt
index faf0d2d4..2787220e 100644
--- a/mods/ITEMS/mcl_throwing/depends.txt
+++ b/mods/ITEMS/mcl_throwing/depends.txt
@@ -1,3 +1,4 @@
 mcl_core?
 mcl_mobitems?
 doc?
+mcl_fishing
diff --git a/mods/MISC/mcl_wip/init.lua b/mods/MISC/mcl_wip/init.lua
index 0b042e21..4f8f0a56 100644
--- a/mods/MISC/mcl_wip/init.lua
+++ b/mods/MISC/mcl_wip/init.lua
@@ -3,7 +3,6 @@
 local S = minetest.get_translator("mcl_wip")
 
 local wip_items = {
-	"mcl_fishing:fishing_rod",
 	"mcl_maps:empty_map",
 	"mcl_comparators:comparator_off_comp",
 	"mcl_minecarts:hopper_minecart",

From c50958a6407555471d2c8030fd64dfac4d004dc0 Mon Sep 17 00:00:00 2001
From: Rootyjr <41842051+Rootyjr@users.noreply.github.com>
Date: Tue, 30 Jul 2019 22:39:07 -0500
Subject: [PATCH 3/7] Fix fishing depends.txt

---
 mods/ITEMS/mcl_fishing/depends.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mods/ITEMS/mcl_fishing/depends.txt b/mods/ITEMS/mcl_fishing/depends.txt
index 1fd904fe..93ef0bf5 100644
--- a/mods/ITEMS/mcl_fishing/depends.txt
+++ b/mods/ITEMS/mcl_fishing/depends.txt
@@ -2,4 +2,3 @@ mcl_core
 mcl_sounds
 mcl_loot
 mcl_mobs
-mcl_throwing

From 48b73f5f2e11c73be39655c79fd7667a138bf65c Mon Sep 17 00:00:00 2001
From: Rootyjr <41842051+Rootyjr@users.noreply.github.com>
Date: Tue, 30 Jul 2019 22:47:40 -0500
Subject: [PATCH 4/7] Add self-credit.

---
 mods/ITEMS/mcl_fishing/init.lua | 85 +--------------------------------
 1 file changed, 2 insertions(+), 83 deletions(-)

diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua
index 0d34779d..65c2590e 100644
--- a/mods/ITEMS/mcl_fishing/init.lua
+++ b/mods/ITEMS/mcl_fishing/init.lua
@@ -1,3 +1,5 @@
+--Fishing Rod, Bobber, and Flying Bobber mechanics and Bobber artwork by Rootyjr.
+
 local S = minetest.get_translator("mcl_fishing")
 local mod_throwing = minetest.get_modpath("mcl_throwing")
 
@@ -5,89 +7,6 @@ local entity_mapping = {
 	["mcl_fishing:bobber"] = "mcl_fishing:bobber_entity",
 }
 
-local go_fishing = function(itemstack, user, pointed_thing)
-	if pointed_thing and pointed_thing.under then
-		-- Use pointed node's on_rightclick function first, if present
-		local node = minetest.get_node(pointed_thing.under)
-		if user and not user:get_player_control().sneak then
-			if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
-				return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
-			end
-		end
-
-		if string.find(node.name, "mcl_core:water") then
-			local itemname
-			local itemcount = 1
-			local itemwear = 0
-			-- FIXME: Maybe use a better seeding
-			local pr = PseudoRandom(os.time() * math.random(1, 100))
-			local r = pr:next(1, 100)
-			if r <= 85 then
-				-- Fish
-				items = mcl_loot.get_loot({
-					items = {
-						{ itemstring = "mcl_fishing:fish_raw", weight = 60 },
-						{ itemstring = "mcl_fishing:salmon_raw", weight = 25 },
-						{ itemstring = "mcl_fishing:clownfish_raw", weight = 2 },
-						{ itemstring = "mcl_fishing:pufferfish_raw", weight = 13 },
-					}
-				}, pr)
-			elseif r <= 95 then
-				-- Junk
-				items = mcl_loot.get_loot({
-					items = {
-						{ itemstring = "mcl_core:bowl", weight = 10 },
-						{ itemstring = "mcl_fishing:fishing_rod", weight = 2, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
-						{ itemstring = "mcl_mobitems:leather", weight = 10 },
-						{ itemstring = "3d_armor:boots_leather", weight = 10, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
-						{ itemstring = "mcl_mobitems:rotten_flesh", weight = 10 },
-						{ itemstring = "mcl_core:stick", weight = 5 },
-						{ itemstring = "mcl_mobitems:string", weight = 5 },
-						{ itemstring = "mcl_potions:potion_water", weight = 10 },
-						{ itemstring = "mcl_mobitems:bone", weight = 10 },
-						{ itemstring = "mcl_dye:black", weight = 1, amount_min = 10, amount_max = 10 },
-						{ itemstring = "mcl_mobitems:string", weight = 10 }, -- TODO: Tripwire Hook
-					}
-				}, pr)
-			else
-				-- Treasure
-				items = mcl_loot.get_loot({
-					items = {
-						-- TODO: Enchanted Bow
-						{ itemstring = "mcl_bows:bow", wear_min = 49144, wear_max = 65535 }, -- 75%-100% damage
-						-- TODO: Enchanted Book
-						{ itemstring = "mcl_books:book" },
-						-- TODO: Enchanted Fishing Rod
-						{ itemstring = "mcl_fishing:fishing_rod", wear_min = 49144, wear_max = 65535 }, -- 75%-100% damage
-						{ itemstring = "mcl_mobs:nametag", },
-						{ itemstring = "mcl_mobitems:saddle", },
-						{ itemstring = "mcl_flowers:waterlily", },
-					}
-				}, pr)
-			end
-			local item
-			if #items >= 1 then
-				item = ItemStack(items[1])
-			else
-				item = ItemStack()
-			end
-			local inv = user:get_inventory()
-			if inv:room_for_item("main", item) then
-				inv:add_item("main", item)
-			end
-			if not minetest.settings:get_bool("creative_mode") then
-				local idef = itemstack:get_definition()
-				itemstack:add_wear(65535/65) -- 65 uses
-				if itemstack:get_count() == 0 and idef.sound and idef.sound.breaks then
-					minetest.sound_play(idef.sound.breaks, {pos=pointed_thing.above, gain=0.5})
-				end
-			end
-			return itemstack
-		end
-	end
-	return nil
-end
-
 local bobber_ENTITY={
 	physical = false,
 	timer=0,

From 37af2dbba1b89945bce2ca51b923c65784924141 Mon Sep 17 00:00:00 2001
From: Rootyjr <41842051+Rootyjr@users.noreply.github.com>
Date: Wed, 31 Jul 2019 22:34:53 -0500
Subject: [PATCH 5/7] Fix fishing allowed in lava.

---
 mods/ITEMS/mcl_fishing/init.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua
index 65c2590e..6b5554f1 100644
--- a/mods/ITEMS/mcl_fishing/init.lua
+++ b/mods/ITEMS/mcl_fishing/init.lua
@@ -15,8 +15,8 @@ local bobber_ENTITY={
 	collisionbox = {0.45,0.45,0.45,0.45,0.45,0.45},
 	pointable = false,
 
-	get_staticdata = get_staticdata,
-	on_activate = on_activate,
+	--get_staticdata = get_staticdata,
+	--on_activate = on_activate,
 
 	_lastpos={},
 	_dive = false,
@@ -191,7 +191,7 @@ local bobber_on_step = function(self, dtime)
 		
 	end
 	--if in liquid then bob.
-	if def.liquidtype == "source" then
+	if def.liquidtype == "source" and def.name == "mcl_core:water" then
 		if self._oldy == nil then
 			self.object:set_pos({x=self.object:get_pos().x,y=math.floor(self.object:get_pos().y)+.5,z=self.object:get_pos().z})
 			self._oldy = self.object:get_pos().y

From d11b089baca4005f8ff3941c2d00e257d43a4b68 Mon Sep 17 00:00:00 2001
From: Rootyjr <41842051+Rootyjr@users.noreply.github.com>
Date: Fri, 2 Aug 2019 14:38:00 -0500
Subject: [PATCH 6/7] Split search distance in half.

---
 mods/ITEMS/mcl_fishing/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua
index 6b5554f1..c27012f3 100644
--- a/mods/ITEMS/mcl_fishing/init.lua
+++ b/mods/ITEMS/mcl_fishing/init.lua
@@ -30,7 +30,7 @@ local bobber_ENTITY={
 local fish = function(itemstack, player)
 		local pos = player:get_pos()
 
-		local objs = minetest.get_objects_inside_radius(pos, 250)
+		local objs = minetest.get_objects_inside_radius(pos, 125)
 		local num = 0
 		local ent = nil
 		local noent = true

From a765d3dd4f37b74d4a3619384e8f5ada3870b27c Mon Sep 17 00:00:00 2001
From: Rootyjr <41842051+Rootyjr@users.noreply.github.com>
Date: Sat, 3 Aug 2019 21:34:33 -0500
Subject: [PATCH 7/7] Update init.lua

---
 mods/ITEMS/mcl_fishing/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua
index c27012f3..c5e351e4 100644
--- a/mods/ITEMS/mcl_fishing/init.lua
+++ b/mods/ITEMS/mcl_fishing/init.lua
@@ -191,7 +191,7 @@ local bobber_on_step = function(self, dtime)
 		
 	end
 	--if in liquid then bob.
-	if def.liquidtype == "source" and def.name == "mcl_core:water" then
+	if def.liquidtype == "source" and def.name == "mcl_core:water_source" then
 		if self._oldy == nil then
 			self.object:set_pos({x=self.object:get_pos().x,y=math.floor(self.object:get_pos().y)+.5,z=self.object:get_pos().z})
 			self._oldy = self.object:get_pos().y