Module:SpriteFile: Difference between revisions

← Older edit

@@ Line 18: / Line 18: @@
 	local id = mw.text.trim( tostring( args[1] or '' ) )
-	local useGif = id:match("\\gif$")
+	if not args.keepcase then
-    if useGif then
+		id = mw.ustring.lower( id ):gsub( '[%s%+]', '-' )
-    	id = id:gsub("\\gif$", "")
 	end
+	local mod = id:match( '([^:%]]+):' ) or "Minecraft"
+	local nameStart = ( id:find( ':' ) or id:find( '%]' ) or 0 ) + 1
+	if nameStart - 1 == #id then
+		nameStart = 1
+	end
+	local nameId = id:sub( nameStart, ( id:find( '[,%[]', nameStart ) or 0 ) - 1 )
 	local link = ( args.link or '' )
@@ Line 44: / Line 51: @@
 	end
-	local name = args.name
+	local name = args.name or ''
+	if name == 'InvSprite' then
+		name = 'Invicon'
+	end
+	local file = ''
-	local fileExtension = useGif and '.gif' or '.png'
+	if mod == 'Minecraft' or mod == 'minecraft' then
-    local file = name .. ' ' .. id .. fileExtension
+		file = name .. ' ' .. nameId .. '.png'
-    local altText = file .. ': Sprite image for ' .. id .. ' in Minecraft'
+	else
-    if link ~= '' then
+		file = name .. ' ' .. mod .. ' ' .. nameId .. '.png'
-        altText = altText .. ' linking to ' .. link
+	end
-    end
-    if id == '' then
+	local altText = ''
-        file = 'Grid Unknown.png'
+	if link == '' then
-        altText = 'Unknown sprite image'
+		altText = file .. ': Sprite image for ' .. nameId .. ' in ' .. mod
-    end
+	end
+	if id == '' then
+		file = 'Grid Unknown.png'
+		altText = 'Unknown sprite image'
+	end
 	local sprite = mw.html.create( 'span' ):addClass( 'sprite-file' )
 	local img = '[[File:' .. file .. '|' .. size .. '|link=' .. link .. '|alt=' .. altText .. '|class=pixel-image|' .. ( args.title or '' ) .. ']]'
@@ Line 77: / Line 92: @@
 		if args.title then
 			spriteText:attr( 'title', args.title )
+		else
+			spriteText:attr( 'title', nameId )
 		end
 		if link ~= '' then
@@ Line 106: / Line 123: @@
 	local link = args[1]
-	link = link and link:gsub("\\gif$", "")
 	if args[1] and not args.id then
-        link = link:match('^(.-)%+') or link
+		link = args[1]:match( '^(.-)%+' ) or args[1]
-    end
+	end
+	local text
-    local text
+	if not args.notext then
-    if not args.notext then
+		text = args.text or args[2] or ''
-        text = args.text or args[2] or link
-    end
+		if text == '' then
+			local nameStart = (link:find( ':' ) or 0 ) + 1
+			if nameStart - 1 == #link then
+				nameStart = 1
+			end
+			text = link:sub( nameStart, ( link:find( '[,%[]', nameStart ) or 0 ) - 1 )
+		end
+	end
 	args[1] = args.id or args[1]
-    args.link = args.link or link
+	args.link = args.link or link
-    args.text = text
+	args.text = text
-    return p.sprite(args)
+	return p.sprite( args )
 end
 return p