Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sort materials lists by field names #35

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 63 additions & 63 deletions src/materials/farlands_reloaded.lua
Original file line number Diff line number Diff line change
@@ -1,81 +1,81 @@
local materials = {
sand = "fl_stone:sand",
sandstone = "fl_stone:sandstone",
gravel = "fl_topsoil:gravel",
flint = "fl_topsoil:flint",
copper_ingot = "fl_ores:copper_ingot",
steel_ingot = "fl_ores:iron_ingot",
gold_ingot = "fl_ores:gold_ingot",
tin_ingot = "fl_ores:tin_ingot",
copper_block = "fl_ores:copper_block",
steel_block = "fl_ores:iron_block",
gold_block = "fl_ores:gold_block",
tin_block = "fl_ores:tin_block",
axe_steel = "fl_tools:steel_axe",
axe_diamond = "fl_tools:diamond_axe",
apple_leaves = "fl_trees:apple_leaves",
apple_log = "fl_trees:apple_trunk",
apple_planks = "fl_trees:apple_plank",
axe_bronze = "fl_tools:bronze_axe",
axe_diamond = "fl_tools:diamond_axe",
axe_steel = "fl_tools:steel_axe",
axe_stone = "fl_tools:stone_axe",
axe_wood = "fl_tools:wood_axe",
pick_steel = "fl_tools:steel_pick",
mese = "fl_ores:iron_ingot",
mese_crystal = "fl_ores:iron_ingot",
mese_crystal_fragment = "fl_ores:iron_ingot",
torch = "fl_light_sources:torch",
diamond = "fl_ores:diamond",
birch_leaves = "fl_trees:aspen_leaves",
birch_log = "fl_trees:aspen_trunk",
birch_planks = "fl_trees:aspen_plank",
book = "",
bowl = "",
brick = "",
chest = "fl_storage:wood_chest",
clay_lump = "fl_bricks:clay_lump",
water_bucket = "fl_bucket:bucket_water",
empty_bucket = "fl_bucket:bucket",
dye_dark_grey = "fl_dyes:dark_grey_dye",
coal_lump = "fl_ores:coal_ore",
cobble = "fl_stone:stone_rubble",
copper_block = "fl_ores:copper_block",
copper_ingot = "fl_ores:copper_ingot",
desert_sand = "fl_stone:desert_sand",
desert_stone = "fl_stone:desert_stone",
diamond = "fl_ores:diamond",
dirt = "fl_stone:dirt",
dirt_with_grass = "fl_topsoil:dirt_with_grass",
dye_black = "fl_dyes:black_dye",
dye_white = "fl_dyes:white_dye",
dye_green = "fl_dyes:green_dye",
dye_red = "fl_dyes:red_dye",
dye_yellow = "fl_dyes:yellow_dye",
dye_brown = "fl_dyes:brown_dye",
dye_blue = "fl_dyes:blue_dye",
dye_violet = "fl_dyes:violet_dye",
dye_grey = "fl_dyes:grey_dye",
dye_brown = "fl_dyes:brown_dye",
dye_cyan = "fl_dyes:cyan_dye",
dye_dark_green = "fl_dyes:dark_green_dye",
dye_dark_grey = "fl_dyes:dark_grey_dye",
dye_green = "fl_dyes:green_dye",
dye_grey = "fl_dyes:grey_dye",
dye_orange = "fl_dyes:orange_dye",
dye_pink = "fl_dyes:pink_dye",
dye_cyan = "fl_dyes:cyan_dye",
silver_ingot = "fl_ores:iron_ingot",
silicon = "mesecons_materials:silicon",
string = "fl_plantlife:oxeye_daisy",
paper = "",
book = "",
iron_lump = "fl_ores:iron_ore",
wool_grey = "",
wool_green = "",
wool_dark_green = "",
wool_brown = "",
wool_black = "",
wool_white = "",
slab_stone = "fl_stone:stone_slab",
slab_wood = "fl_trees:apple_plank_slab",
dye_red = "fl_dyes:red_dye",
dye_violet = "fl_dyes:violet_dye",
dye_white = "fl_dyes:white_dye",
dye_yellow = "fl_dyes:yellow_dye",
empty_bucket = "fl_bucket:bucket",
flint = "fl_topsoil:flint",
glass = "fl_glass:framed_glass",
glass_block = "fl_glass:framed_glass",
glass_bottle = "fl_bottles:bottle",
coal_lump = "fl_ores:coal_ore",
stone = "fl_stone:stone",
desert_stone = "fl_stone:desert_stone",
desert_sand = "fl_stone:desert_sand",
chest = "fl_storage:wood_chest",
cobble = "fl_stone:stone_rubble",
brick = "",
gold_block = "fl_ores:gold_block",
gold_ingot = "fl_ores:gold_ingot",
gravel = "fl_topsoil:gravel",
iron_lump = "fl_ores:iron_ore",
jungle_leaves = "fl_trees:jungletree_leaves",
mese = "fl_ores:iron_ingot",
mese_crystal = "fl_ores:iron_ingot",
mese_crystal_fragment = "fl_ores:iron_ingot",
obsidian_glass = "",
water_source = "fl_liquids:water_source",
paper = "",
pick_steel = "fl_tools:steel_pick",
sand = "fl_stone:sand",
sandstone = "fl_stone:sandstone",
silicon = "mesecons_materials:silicon",
silver_ingot = "fl_ores:iron_ingot",
slab_stone = "fl_stone:stone_slab",
slab_wood = "fl_trees:apple_plank_slab",
steel_block = "fl_ores:iron_block",
steel_ingot = "fl_ores:iron_ingot",
stone = "fl_stone:stone",
string = "fl_plantlife:oxeye_daisy",
tin_block = "fl_ores:tin_block",
tin_ingot = "fl_ores:tin_ingot",
torch = "fl_light_sources:torch",
water_bucket = "fl_bucket:bucket_water",
water_flowing = "fl_liquids:water_flowing",
dirt = "fl_stone:dirt",
dirt_with_grass = "fl_topsoil:dirt_with_grass",
apple_leaves = "fl_trees:apple_leaves",
apple_log = "fl_trees:apple_trunk",
apple_planks = "fl_trees:apple_plank",
birch_leaves = "fl_trees:aspen_leaves",
birch_log = "fl_trees:aspen_trunk",
birch_planks = "fl_trees:aspen_plank",
jungle_leaves = "fl_trees:jungletree_leaves",
bowl = "",
water_source = "fl_liquids:water_source",
wool_black = "",
wool_brown = "",
wool_dark_green = "",
wool_green = "",
wool_grey = "",
wool_white = "",
}

if minetest.get_modpath("basic_materials") then
Expand Down
135 changes: 66 additions & 69 deletions src/materials/hades_revisited.lua
Original file line number Diff line number Diff line change
@@ -1,88 +1,85 @@
local materials = {
sand = "hades_core:fertile_sand",
sandstone = "hades_core:sandstone",
gravel = "hades_core:gravel",
flint = "",
copper_ingot = "hades_core:copper_ingot",
steel_ingot = "hades_core:steel_ingot",
gold_ingot = "hades_core:gold_ingot",
tin_ingot = "hades_core:tin_ingot",
silver_ingot = "--unknown--",
copper_block = "hades_core:copperblock",
steel_block = "hades_core:steelblock",
gold_block = "hades_core:goldblock",
tin_block = "hades_core:tinblock",
axe_steel = "hades_core:axe_steel",
axe_diamond = "hades_core:axe_diamond",
apple_leaves = "hades_trees:leaves",
apple_log = "hades_trees:tree",
apple_planks = "hades_trees:wood",
axe_bronze = "hades_core:axe_bronze",
axe_diamond = "hades_core:axe_diamond",
axe_steel = "hades_core:axe_steel",
axe_stone = "hades_core:axe_stone",
axe_wood = "hades_core:axe_wood",
pick_steel = "hades_core:pick_steel",
mese = "hades_core:mese",
mese_crystal = "hades_core:mese_crystal",
mese_crystal_fragment = "hades_core:mese_crystal_fragment",
torch = "hades_torches:torch",
diamond = "hades_core:diamond",
clay_lump = "hades_core:clay_lump",
birch_leaves = "hades_core:birch_leaves",
birch_log = "hades_trees:birch_tree",
birch_planks = "hades_trees:cream_wood",
book = "hades_core:book",
-- hades has no bowl but you get plate on eat so makes most sense.
bowl = "hades_food:plate",
brick = "hades_core:brick",
chest = "hades_chests:chest";
clay_brick = "hades_core:clay_brick",

--[[
Since hades doesnt have buckets or water for the user,
using dirt from near water to pull the water out
]]
water_bucket = "hades_core:dirt",
empty_bucket = "hades_core:fertile_sand",
dye_dark_grey = "dye:dark_grey",
clay_lump = "hades_core:clay_lump",
coal_lump = "hades_core:coal_lump",
cobble = "hades_core:cobble",
copper_block = "hades_core:copperblock",
copper_ingot = "hades_core:copper_ingot",
desert_sand = "hades_core:volcanic_sand",
desert_stone = "hades_core:stone_baked",
diamond = "hades_core:diamond",
dirt = "hades_core:dirt",
dirt_with_grass = "hades_core:dirt_with_grass",
dye_black = "dye:black",
dye_white = "dye:white",
dye_green = "dye:green",
dye_red = "dye:red",
dye_yellow = "dye:yellow",
dye_brown = "dye:brown",
dye_blue = "dye:blue",
dye_violet = "dye:violet",
dye_grey = "dye:grey",
dye_brown = "dye:brown",
dye_cyan = "dye:cyan",
dye_dark_green = "dye:dark_green",
dye_dark_grey = "dye:dark_grey",
dye_green = "dye:green",
dye_grey = "dye:grey",
dye_orange = "dye:orange",
dye_pink = "dye:pink",
dye_cyan = "dye:cyan",
silicon = "hades_materials:silicon",
string = "hades_farming:string",
paper = "hades_core:paper",
book = "hades_core:book",
iron_lump = "hades_core:iron_lump",
wool_grey = "wool:grey",
wool_green = "wool:green",
wool_dark_green = "wool:dark_green",
wool_brown = "wool:brown",
wool_black = "wool:black",
wool_white = "wool:white",
slab_stone = "stairs:slab_stone",
slab_wood = "stairs:slab_wood",
dye_red = "dye:red",
dye_violet = "dye:violet",
dye_white = "dye:white",
dye_yellow = "dye:yellow",
empty_bucket = "hades_core:fertile_sand",
flint = "",
glass = "hades_core:glass",
glass_block = "hades_core:glass",
glass_bottle = "vessels:glass_bottle",
gold_block = "hades_core:goldblock",
gold_ingot = "hades_core:gold_ingot",
gravel = "hades_core:gravel",
iron_lump = "hades_core:iron_lump",
jungle_leaves = "hades_trees:jungle_leaves",
mese = "hades_core:mese",
mese_crystal = "hades_core:mese_crystal",
mese_crystal_fragment = "hades_core:mese_crystal_fragment",
obsidian_glass = "hades_core:obsidian_glass",
coal_lump = "hades_core:coal_lump",
paper = "hades_core:paper",
pick_steel = "hades_core:pick_steel",
sand = "hades_core:fertile_sand",
sandstone = "hades_core:sandstone",
silicon = "hades_materials:silicon",
silver_ingot = "--unknown--",
slab_stone = "stairs:slab_stone",
slab_wood = "stairs:slab_wood",
steel_block = "hades_core:steelblock",
steel_ingot = "hades_core:steel_ingot",
stone = "hades_core:stone",
desert_stone = "hades_core:stone_baked",
desert_sand = "hades_core:volcanic_sand",
chest = "hades_chests:chest";
cobble = "hades_core:cobble",
brick = "hades_core:brick",
water_source = "hades_core:water_source",
string = "hades_farming:string",
tin_block = "hades_core:tinblock",
tin_ingot = "hades_core:tin_ingot",
torch = "hades_torches:torch",
-- Since hades doesnt have buckets or water for the user,
-- using dirt from near water to pull the water out
water_bucket = "hades_core:dirt",
water_flowing = "hades_core:water_flowing",
dirt = "hades_core:dirt",
dirt_with_grass = "hades_core:dirt_with_grass",
apple_leaves = "hades_trees:leaves",
apple_log = "hades_trees:tree",
apple_planks = "hades_trees:wood",
birch_leaves = "hades_core:birch_leaves",
birch_log = "hades_trees:birch_tree",
birch_planks = "hades_trees:cream_wood",
jungle_leaves = "hades_trees:jungle_leaves",
--hades has no bowl but you get plate on eat so makes most sense?
bowl = "hades_food:plate",
water_source = "hades_core:water_source",
wool_black = "wool:black",
wool_brown = "wool:brown",
wool_dark_green = "wool:dark_green",
wool_green = "wool:green",
wool_grey = "wool:grey",
wool_white = "wool:white",
}

if minetest.get_modpath("hades_bucket") then
Expand Down
Loading