Module:Inventory slot/Aliases: Difference between revisions

Fix copper stuff
Fix inconsistencies and duplicates in wooden item aliases, use automatic alias correctly (no manual definition of nether wood items!)
Line 386: Line 386:
['Stone Button'] = { 'Stone Button', 'Polished Blackstone Button' },
['Stone Button'] = { 'Stone Button', 'Polished Blackstone Button' },
['Stone Pressure Plate'] = { 'Stone Pressure Plate', 'Polished Blackstone Pressure Plate' },
['Stone Pressure Plate'] = { 'Stone Pressure Plate', 'Polished Blackstone Pressure Plate' },
['Nether Wood Pressure Plate'] = { 'Crimson Pressure Plate', 'Warped Pressure Plate' },
['Nether Wood Fence'] = { 'Crimson Fence', 'Warped Fence' },
['Nether Wood Trapdoor'] = { 'Crimson Trapdoor', 'Warped Trapdoor' },
['Nether Wood Fence Gate'] = { 'Crimson Fence Gate', 'Warped Fence Gate' },
['Nether Wood Stairs'] = { 'Crimson Stairs', 'Warped Stairs' },
['Nether Wood Door'] = { 'Crimson Door', 'Warped Door' },
['Nether Wood Sign'] = { 'Crimson Sign', 'Warped Sign' },
['Candle'] = { 'Candle', 'White Candle', 'Light Gray Candle', 'Gray Candle', 'Black Candle', 'Brown Candle', 'Red Candle', 'Orange Candle', 'Yellow Candle',
['Candle'] = { 'Candle', 'White Candle', 'Light Gray Candle', 'Gray Candle', 'Black Candle', 'Brown Candle', 'Red Candle', 'Orange Candle', 'Yellow Candle',
'Lime Candle', 'Green Candle', 'Cyan Candle', 'Light Blue Candle', 'Blue Candle', 'Purple Candle', 'Magenta Candle', 'Pink Candle',  },
'Lime Candle', 'Green Candle', 'Cyan Candle', 'Light Blue Candle', 'Blue Candle', 'Purple Candle', 'Magenta Candle', 'Pink Candle',  },
Line 797: Line 790:
local woodItems = {
local woodItems = {
     overworld = {
     overworld = {
        'Log',
         'Wood',
         'Wood',
         'Log',
         'Stripped $1 Log',
        'Stripped $1 Wood',
         'Boat',
         'Boat',
         'Boat with Chest',
         'Boat with Chest',
        'Stripped $1 Log',
        'Stripped $1 Wood',
        'Wood Planks',
        'Wood Slab',
        'Wood Stairs',
        'Wood Pressure Plate',
        'Wood Button',
        'Wood Door',
        'Wood Trapdoor',
        'Wood Fence Gate',
        'Wood Fence',
        'Wood Sign',
        'Wood Hanging Sign',
         'Sapling',
         'Sapling',
     },
     },
Line 823: Line 805:
     },
     },
     both = {
     both = {
         '$world Planks',
-- Any/Matching X or Y
         '${Log,Stem}',
         '${Wood,Hyphae}',
         '${Wood,Hyphae}',
        '${Log,Stem}',
         'Stripped $1 ${Wood,Hyphae}',
         'Stripped $1 ${Wood,Hyphae}',
         'Stripped $1 ${Log,Stem}',
         'Stripped $1 ${Log,Stem}',
-- Dimensional prefixes
        '$world Planks',
        '$world $wood Stairs',
        '$world $wood Slab',
        '$world $wood Fence',
        '$world $wood Fence Gate',
        '$world $wood Door',
        '$world $wood Trapdoor',
        '$world $wood Pressure Plate',
        '$world $wood Button',
        '$world $wood Sign',
        '$world $wood Hanging Sign',
-- Both dimensions
-- Items with non-wood variants include $wood
        'Planks',
        '$wood Stairs',
        '$wood Slab',
        '$wood Fence',
         'Fence Gate',
         'Fence Gate',
        -- '$world Wood Fence',
        '$wood Fence',
         '$wood Door',
         '$wood Door',
        '$wood Trapdoor',
        '$wood Pressure Plate',
         '$wood Button',
         '$wood Button',
         '$wood Pressure Plate',
         'Sign',
         '$world Hanging Sign',
         'Hanging Sign',
        '$wood Trapdoor',
        '$world $wood Slab',
        '$wood Stairs',
        'Sign'
     }
     }
}
}
Line 849: Line 847:
             woodItemWorld['Overworld ' .. item] = 'overworld'
             woodItemWorld['Overworld ' .. item] = 'overworld'
woodItemWorld['Nether ' .. item] = 'nether'
woodItemWorld['Nether ' .. item] = 'nether'
else
woodItemWorld[item] = world
end
end
woodItemWorld[item] = world
     end
     end
end
end
Line 886: Line 885:
itemName = itemName:gsub( '%$1', wood)
itemName = itemName:gsub( '%$1', wood)
else
else
itemName = wood .. ' ' .. itemName:gsub( 'Wood ', '' )
itemName = wood .. ' ' .. itemName
end
end
Line 901: Line 900:
-- Parse ${,} (world-select) syntax
-- Parse ${,} (world-select) syntax
item = item:gsub("%${(.-),(.-)}", "%1 or %2")
item = item:gsub("%${(.-),(.-)}", "%1 or %2")
     item = item:gsub('%$wood ', 'wood ')
     item = item:gsub('%$wood', 'Wood')
     item = item:gsub('%$1 ', '')
     item = item:gsub('%$1 ', '')
     aliases['Any ' .. item] = woodAliases
     aliases['Any ' .. item] = woodAliases