Merge pull request 'Fix Water in Nether Using Fish Buckets' (#2506) from water_in_nether_fix into master

Reviewed-on: MineClone2/MineClone2#2506
Reviewed-by: cora <cora@noreply.git.minetest.land>

mods/ENTITIES/mobs_mc/cod.lua

@@ -104,7 +104,7 @@ local cod = {
 	on_rightclick = function(self, clicker)
 		if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
 			self.object:remove()
-			clicker:set_wielded_item("mcl_fishing:bucket_cod")
+			clicker:set_wielded_item("mcl_buckets:bucket_cod")
 			awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
 		end
 	end

mods/ENTITIES/mobs_mc/salmon.lua

@@ -60,7 +60,7 @@ local salmon = {
 	on_rightclick = function(self, clicker)
 		if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
 			self.object:remove()
-			clicker:set_wielded_item("mcl_fishing:bucket_salmon")
+			clicker:set_wielded_item("mcl_buckets:bucket_salmon")
 			awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
 		end
 	end

mods/ENTITIES/mobs_mc/tropical_fish.lua

@@ -105,7 +105,7 @@ local tropical_fish = {
 	on_rightclick = function(self, clicker)
 		if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
 			self.object:remove()
-			clicker:set_wielded_item("mcl_fishing:bucket_tropical_fish")
+			clicker:set_wielded_item("mcl_buckets:bucket_tropical_fish")
 			awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
 		end
 	end,

mods/ITEMS/mcl_buckets/locale/template.txt

@@ -15,3 +15,10 @@ Collects liquids=
 Places a lava source=
 Places a water source=
 Places a river water source=
+Cod=
+Salmon=
+Tropical Fish=
+Bucket of @1=
+This bucket is filled with water and @1.=
+Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.=
+Places a water source and a @1 fish.=

mods/ITEMS/mcl_buckets/register.lua

@@ -118,3 +118,38 @@ minetest.register_craft({
 	burntime = 1000,
 	replacements = {{"mcl_buckets:bucket_lava", "mcl_buckets:bucket_empty"}},
 })
+
+-- Fish Buckets
+fish_names = {
+	{ techname = "cod", name = "Cod" },
+	{ techname = "salmon", name = "Salmon" },
+	--{ techname = "pufferfish", name = "Pufferfish" } FIXME: Uncomment when pufferfish mobs are added.
+	{ techname = "tropical_fish", name = "Tropical Fish" }
+}
+
+for _, fish in pairs(fish_names) do
+	mcl_buckets.register_liquid({
+		bucketname = "mcl_buckets:bucket_" .. fish.techname,
+		source_place = function(pos)
+			minetest.add_entity(pos, "mobs_mc:" .. fish.techname)
+			return "mcl_core:water_source"
+		end,
+		source_take = {"mobs_mc:" .. fish.techname},
+		inventory_image = fish.techname .. "_bucket.png",
+		name = S("Bucket of @1", S(fish.name)),
+		longdesc = S("This bucket is filled with water and @1.", S(fish.name)),
+		usagehelp = S("Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.", S(fish.name), S(fish.name)),
+		tt_help = S("Places a water source and a @1 fish.", S(fish.name)),
+		extra_check = function(pos, placer)
+			local dim = mcl_worlds.pos_to_dimension(pos)
+			if dim == "nether" then
+				minetest.sound_play("fire_extinguish_flame", {pos = pos, gain = 0.25, max_hear_distance = 16}, true)
+				return false, true
+			else
+				return true, true
+			end
+		end,
+	})
+	minetest.register_alias("mcl_fishing:bucket_" .. fish.techname, "mcl_buckets:bucket_" .. fish.techname)
+end
+

mods/ITEMS/mcl_fishing/init.lua

@@ -516,30 +516,3 @@ minetest.register_on_item_eat(function (hp_change, replace_with_item, itemstack,
 	end
 
 end )
-
--- Fish Buckets
-fish_names = {
-	{ techname = "cod", name = "Cod" },
-	{ techname = "salmon", name = "Salmon" },
-	--{ techname = "pufferfish", name = "Pufferfish" } FIXME: Uncomment when pufferfish mobs are added.
-	{ techname = "tropical_fish", name = "Tropical Fish" }
-}
-
-for _, fish in pairs(fish_names) do
-	mcl_buckets.register_liquid({
-		bucketname = "mcl_fishing:bucket_" .. fish.techname,
-		source_place = function(pos)
-			minetest.add_entity(pos, "mobs_mc:" .. fish.techname)
-			return "mcl_core:water_source"
-		end,
-		source_take = {"mobs_mc:" .. fish.techname},
-		inventory_image = fish.techname .. "_bucket.png",
-		name = S("Bucket of @1", S(fish.name)),
-		longdesc = S("This bucket is filled with water and @1.", S(fish.name)),
-		usagehelp = S("Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.", S(fish.name), S(fish.name)),
-		tt_help = S("Places a water source and a @1 fish.", S(fish.name)),
-		extra_check = function(pos, placer)
-			return true, true
-		end,
-	})
-end

mods/ITEMS/mcl_fishing/locale/template.txt

@@ -16,10 +16,3 @@ Pufferfish=
 Pufferfish are a common species of fish and can be obtained by fishing. They can technically be eaten, but they are very bad for humans. Eating a pufferfish only restores 1 hunger point and will poison you very badly (which drains your health non-fatally) and causes serious food poisoning (which increases your hunger).=
 Catches fish in water=
 Very poisonous=
-Cod=
-Salmon=
-Tropical Fish=
-Bucket of @1=
-This bucket is filled with water and @1.=
-Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.=
-Places a water source and a @1 fish.=