summaryrefslogtreecommitdiff
path: root/unified_inventory
diff options
context:
space:
mode:
Diffstat (limited to 'unified_inventory')
-rw-r--r--unified_inventory/api.lua24
-rw-r--r--unified_inventory/depends.txt1
-rw-r--r--unified_inventory/textures/ui_colorbutton0.pngbin0 -> 147 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton1.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton10.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton11.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton12.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton13.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton14.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton15.pngbin0 -> 3562 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton2.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton3.pngbin0 -> 140 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton4.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton5.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton6.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton7.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton8.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_colorbutton9.pngbin0 -> 148 bytes
-rw-r--r--unified_inventory/textures/ui_copper_chest_inventory.pngbin0 -> 11117 bytes
-rw-r--r--unified_inventory/textures/ui_furnace_inventory.pngbin0 -> 7383 bytes
-rw-r--r--unified_inventory/textures/ui_gold_chest_inventory.pngbin0 -> 5813 bytes
-rw-r--r--unified_inventory/textures/ui_iron_chest_inventory.pngbin0 -> 6685 bytes
-rw-r--r--unified_inventory/textures/ui_lv_alloy_furnace.pngbin0 -> 8640 bytes
-rw-r--r--unified_inventory/textures/ui_lv_battery_box.pngbin0 -> 15941 bytes
-rw-r--r--unified_inventory/textures/ui_lv_electric_furnace.pngbin0 -> 4334 bytes
-rw-r--r--unified_inventory/textures/ui_lv_grinder.pngbin0 -> 4334 bytes
-rw-r--r--unified_inventory/textures/ui_main_inventory.pngbin0 -> 7646 bytes
-rw-r--r--unified_inventory/textures/ui_mithril_chest_inventory.pngbin0 -> 7804 bytes
-rw-r--r--unified_inventory/textures/ui_silver_chest_inventory.pngbin0 -> 7743 bytes
-rw-r--r--unified_inventory/textures/ui_wooden_chest_inventory.pngbin0 -> 7490 bytes
30 files changed, 15 insertions, 10 deletions
diff --git a/unified_inventory/api.lua b/unified_inventory/api.lua
index 91681b1..e386a76 100644
--- a/unified_inventory/api.lua
+++ b/unified_inventory/api.lua
@@ -131,29 +131,29 @@ unified_inventory.get_formspec = function(player,page)
formspec = formspec .. "list[current_player;main;0,4.5;8,4;]"
-- backgrounds
- formspec = formspec .. "background[-0.19,-0.2,;14.38,10.55;ui_form_bg.png]"
+ formspec = formspec .. "background[-0.19,-0.2;14.38,10.55;ui_form_bg.png]"
if page=="craft" then
- formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_crafting_form.png]"
+ formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_crafting_form.png]"
end
if page=="craftguide" then
- formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_craftguide_form.png]"
+ formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_craftguide_form.png]"
end
if page=="misc" then
- formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_misc_form.png]"
+ formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_misc_form.png]"
end
if page=="bags" then
- formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_bags_main_form.png]"
+ formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_main_form.png]"
end
for i=1,4 do
if page=="bag"..i then
local slots = player:get_inventory():get_stack(page, 1):get_definition().groups.bagslots
if slots == 8 then
- formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_bags_sm_form.png]"
+ formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]"
elseif slots == 16 then
- formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_bags_med_form.png]"
+ formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_med_form.png]"
elseif slots == 24 then
- formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_bags_lg_form.png]"
+ formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
end
end
end
@@ -560,8 +560,12 @@ unified_inventory.update_recipe = function(player, stack_name, alternate)
local craft = crafts[alternate]
inv:set_stack("output", 1, craft.output)
local items=craft.items
- -- cook, fuel, grinding recipes
- if craft.type == "cooking" or craft.type == "fuel" or craft.type == "grinding" or craft.type == "extracting" then
+
+ -- cooking, fuel, grinding, and extracting recipes
+ if craft.type == "cooking" or
+ craft.type == "fuel" or
+ craft.type == "grinding" or
+ craft.type == "extracting" then
def=unified_inventory.find_item_def(craft["items"][1])
if def then
inv:set_stack("build", 1, def)
diff --git a/unified_inventory/depends.txt b/unified_inventory/depends.txt
index c327490..45b4a33 100644
--- a/unified_inventory/depends.txt
+++ b/unified_inventory/depends.txt
@@ -1 +1,2 @@
creative
+
diff --git a/unified_inventory/textures/ui_colorbutton0.png b/unified_inventory/textures/ui_colorbutton0.png
new file mode 100644
index 0000000..35b7db2
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton0.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton1.png b/unified_inventory/textures/ui_colorbutton1.png
new file mode 100644
index 0000000..cbf095d
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton1.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton10.png b/unified_inventory/textures/ui_colorbutton10.png
new file mode 100644
index 0000000..8dfc5f0
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton10.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton11.png b/unified_inventory/textures/ui_colorbutton11.png
new file mode 100644
index 0000000..3b279e0
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton11.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton12.png b/unified_inventory/textures/ui_colorbutton12.png
new file mode 100644
index 0000000..a387b5f
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton12.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton13.png b/unified_inventory/textures/ui_colorbutton13.png
new file mode 100644
index 0000000..b1e7790
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton13.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton14.png b/unified_inventory/textures/ui_colorbutton14.png
new file mode 100644
index 0000000..c4ad486
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton14.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton15.png b/unified_inventory/textures/ui_colorbutton15.png
new file mode 100644
index 0000000..b7060d6
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton15.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton2.png b/unified_inventory/textures/ui_colorbutton2.png
new file mode 100644
index 0000000..caf1fc6
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton2.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton3.png b/unified_inventory/textures/ui_colorbutton3.png
new file mode 100644
index 0000000..6ac79a3
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton3.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton4.png b/unified_inventory/textures/ui_colorbutton4.png
new file mode 100644
index 0000000..dc43592
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton4.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton5.png b/unified_inventory/textures/ui_colorbutton5.png
new file mode 100644
index 0000000..98b8c67
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton5.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton6.png b/unified_inventory/textures/ui_colorbutton6.png
new file mode 100644
index 0000000..66478bc
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton6.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton7.png b/unified_inventory/textures/ui_colorbutton7.png
new file mode 100644
index 0000000..85f6b93
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton7.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton8.png b/unified_inventory/textures/ui_colorbutton8.png
new file mode 100644
index 0000000..868c35d
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton8.png
Binary files differ
diff --git a/unified_inventory/textures/ui_colorbutton9.png b/unified_inventory/textures/ui_colorbutton9.png
new file mode 100644
index 0000000..50eac0b
--- /dev/null
+++ b/unified_inventory/textures/ui_colorbutton9.png
Binary files differ
diff --git a/unified_inventory/textures/ui_copper_chest_inventory.png b/unified_inventory/textures/ui_copper_chest_inventory.png
new file mode 100644
index 0000000..debc9fc
--- /dev/null
+++ b/unified_inventory/textures/ui_copper_chest_inventory.png
Binary files differ
diff --git a/unified_inventory/textures/ui_furnace_inventory.png b/unified_inventory/textures/ui_furnace_inventory.png
new file mode 100644
index 0000000..ce84efb
--- /dev/null
+++ b/unified_inventory/textures/ui_furnace_inventory.png
Binary files differ
diff --git a/unified_inventory/textures/ui_gold_chest_inventory.png b/unified_inventory/textures/ui_gold_chest_inventory.png
new file mode 100644
index 0000000..b19524b
--- /dev/null
+++ b/unified_inventory/textures/ui_gold_chest_inventory.png
Binary files differ
diff --git a/unified_inventory/textures/ui_iron_chest_inventory.png b/unified_inventory/textures/ui_iron_chest_inventory.png
new file mode 100644
index 0000000..1785f88
--- /dev/null
+++ b/unified_inventory/textures/ui_iron_chest_inventory.png
Binary files differ
diff --git a/unified_inventory/textures/ui_lv_alloy_furnace.png b/unified_inventory/textures/ui_lv_alloy_furnace.png
new file mode 100644
index 0000000..3b98650
--- /dev/null
+++ b/unified_inventory/textures/ui_lv_alloy_furnace.png
Binary files differ
diff --git a/unified_inventory/textures/ui_lv_battery_box.png b/unified_inventory/textures/ui_lv_battery_box.png
new file mode 100644
index 0000000..61c55de
--- /dev/null
+++ b/unified_inventory/textures/ui_lv_battery_box.png
Binary files differ
diff --git a/unified_inventory/textures/ui_lv_electric_furnace.png b/unified_inventory/textures/ui_lv_electric_furnace.png
new file mode 100644
index 0000000..a91b241
--- /dev/null
+++ b/unified_inventory/textures/ui_lv_electric_furnace.png
Binary files differ
diff --git a/unified_inventory/textures/ui_lv_grinder.png b/unified_inventory/textures/ui_lv_grinder.png
new file mode 100644
index 0000000..7af5155
--- /dev/null
+++ b/unified_inventory/textures/ui_lv_grinder.png
Binary files differ
diff --git a/unified_inventory/textures/ui_main_inventory.png b/unified_inventory/textures/ui_main_inventory.png
new file mode 100644
index 0000000..b65dabb
--- /dev/null
+++ b/unified_inventory/textures/ui_main_inventory.png
Binary files differ
diff --git a/unified_inventory/textures/ui_mithril_chest_inventory.png b/unified_inventory/textures/ui_mithril_chest_inventory.png
new file mode 100644
index 0000000..9054775
--- /dev/null
+++ b/unified_inventory/textures/ui_mithril_chest_inventory.png
Binary files differ
diff --git a/unified_inventory/textures/ui_silver_chest_inventory.png b/unified_inventory/textures/ui_silver_chest_inventory.png
new file mode 100644
index 0000000..a61c4b9
--- /dev/null
+++ b/unified_inventory/textures/ui_silver_chest_inventory.png
Binary files differ
diff --git a/unified_inventory/textures/ui_wooden_chest_inventory.png b/unified_inventory/textures/ui_wooden_chest_inventory.png
new file mode 100644
index 0000000..145d9d2
--- /dev/null
+++ b/unified_inventory/textures/ui_wooden_chest_inventory.png
Binary files differ