From 1f0d62825a7977d19ddc83f2c646896727e7ce72 Mon Sep 17 00:00:00 2001 From: maikerumine Date: Wed, 23 Mar 2016 20:00:27 -0400 Subject: [PATCH] RND machines --- mods/basic_machines/grinder.lua | 12 +- mods/basic_machines/recycler.lua | 4 +- mods/creative/README.txt | 22 ++ mods/creative/depends.txt | 1 + mods/creative/init.lua | 253 ++++++++++++++++++ .../creative/textures/creative_trash_icon.png | Bin 0 -> 179 bytes 6 files changed, 286 insertions(+), 6 deletions(-) create mode 100644 mods/creative/README.txt create mode 100644 mods/creative/depends.txt create mode 100644 mods/creative/init.lua create mode 100644 mods/creative/textures/creative_trash_icon.png diff --git a/mods/basic_machines/grinder.lua b/mods/basic_machines/grinder.lua index e4d2799a..76cced72 100644 --- a/mods/basic_machines/grinder.lua +++ b/mods/basic_machines/grinder.lua @@ -8,6 +8,10 @@ basic_machines.grinder_recipes = { ["default:stone"] = {4,"default:sand"}, ["default:cobble"] = {4,"default:gravel"}, ["default:gravel"] = {1,"default:dirt"}, + ["es:aikerum_crystal"] ={4,"es:aikerum_dust"}, -- added for es mod + ["es:ruby_crystal"] = {4,"es:ruby_dust"}, + ["es:emerald_crystal"] = {4,"es:emerald_dust"}, + ["es:purpellium_lump"] = {4,"es:purpellium_dust"}, }; @@ -32,10 +36,9 @@ local grinder_process = function(pos) -- FUEL CHECK local fuel = meta:get_float("fuel"); - fuel = fuel-def[1]; -- burn fuel + - - if fuel<0 then -- we need new fuel, check chest below + if fuel-def[1]<0 then -- we need new fuel, check chest below local fuellist = inv:get_list("fuel") if not fuellist then return end @@ -61,13 +64,14 @@ local grinder_process = function(pos) meta:set_float("fuel",fuel); meta:set_string("infotext", "added fuel furnace burn time " .. fueladd.time .. ", fuel status " .. fuel); end - if fuel<0 then + if fuel-def[1]<0 then meta:set_string("infotext", "need at least " .. -fuel .. " fuel to complete operation "); return end end + fuel = fuel-def[1]; -- burn fuel -- process items diff --git a/mods/basic_machines/recycler.lua b/mods/basic_machines/recycler.lua index ffdeeaf0..50bb76f5 100644 --- a/mods/basic_machines/recycler.lua +++ b/mods/basic_machines/recycler.lua @@ -11,7 +11,7 @@ local recycler_process = function(pos) -- FUEL CHECK local fuel = meta:get_float("fuel"); - if fuel<=0 then -- we need new fuel, check chest below + if fuel-1<0 then -- we need new fuel, check chest below local fuellist = inv:get_list("fuel") if not fuellist then return end @@ -37,7 +37,7 @@ local recycler_process = function(pos) meta:set_float("fuel",fuel); meta:set_string("infotext", "added fuel furnace burn time " .. fueladd.time .. ", fuel status " .. fuel); end - if fuel<=0 then return end + if fuel-1<0 then return end end diff --git a/mods/creative/README.txt b/mods/creative/README.txt new file mode 100644 index 00000000..a34dcaad --- /dev/null +++ b/mods/creative/README.txt @@ -0,0 +1,22 @@ +Minetest Game mod: creative +=========================== + +Implements creative mode. + +Switch on by using the "creative_mode" setting. + +Registered items that +- have a description, and +- do not have the group not_in_creative_inventory +are added to the creative inventory. + +License of source code and media files: +--------------------------------------- +Copyright (C) 2012 Perttu Ahola (celeron55) + +This program is free software. It comes without any warranty, to +the extent permitted by applicable law. You can redistribute it +and/or modify it under the terms of the Do What The Fuck You Want +To Public License, Version 2, as published by Sam Hocevar. See +http://sam.zoy.org/wtfpl/COPYING for more details. + diff --git a/mods/creative/depends.txt b/mods/creative/depends.txt new file mode 100644 index 00000000..4ad96d51 --- /dev/null +++ b/mods/creative/depends.txt @@ -0,0 +1 @@ +default diff --git a/mods/creative/init.lua b/mods/creative/init.lua new file mode 100644 index 00000000..01163707 --- /dev/null +++ b/mods/creative/init.lua @@ -0,0 +1,253 @@ +-- minetest/creative/init.lua + +creative = {} +local player_inventory = {} + +-- Create detached creative inventory after loading all mods +creative.init_creative_inventory = function(player) + local player_name = player:get_player_name() + + player_inventory[player_name] = {} + player_inventory[player_name].size = 0 + player_inventory[player_name].filter = nil + player_inventory[player_name].start_i = 1 + + local inv = minetest.create_detached_inventory("creative_" .. player_name, { + allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) + if minetest.setting_getbool("creative_mode") then + return count + else + return 0 + end + end, + allow_put = function(inv, listname, index, stack, player) + return 0 + end, + allow_take = function(inv, listname, index, stack, player) + if minetest.setting_getbool("creative_mode") then + return -1 + else + return 0 + end + end, + on_move = function(inv, from_list, from_index, to_list, to_index, count, player) + end, + on_put = function(inv, listname, index, stack, player) + end, + on_take = function(inv, listname, index, stack, player) + --print(player:get_player_name().." takes item from creative inventory; listname="..dump(listname)..", index="..dump(index)..", stack="..dump(stack)) + if stack then + minetest.log("action", player:get_player_name().." takes "..dump(stack:get_name()).." from creative inventory") + --print("stack:get_name()="..dump(stack:get_name())..", stack:get_count()="..dump(stack:get_count())) + end + end, + }) + + creative.update_creative_inventory(player_name, nil, 2) + --print("creative inventory size: "..dump(player_inventory[player_name].size)) +end + +local function tab_category(tab_id) + local id_category = { + nil, -- Reserved for crafting tab. + minetest.registered_items, + minetest.registered_nodes, + minetest.registered_tools, + minetest.registered_craftitems + } + + -- If index out of range, show default ("All") page. + return id_category[tab_id] or id_category[2] +end + +function creative.update_creative_inventory(player_name, filter, tab_id) + local creative_list = {} + local inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name}) + + for name, def in pairs(tab_category(tab_id)) do + if not (def.groups.not_in_creative_inventory == 1) and + def.description and def.description ~= "" and + (not filter or def.name:find(filter, 1, true) or + def.description:lower():find(filter, 1, true)) then + creative_list[#creative_list+1] = name + end + end + + table.sort(creative_list) + inv:set_size("main", #creative_list) + inv:set_list("main", creative_list) + player_inventory[player_name].size = #creative_list +end + +-- Create the trash field +local trash = minetest.create_detached_inventory("creative_trash", { + -- Allow the stack to be placed and remove it in on_put() + -- This allows the creative inventory to restore the stack + allow_put = function(inv, listname, index, stack, player) + if minetest.setting_getbool("creative_mode") then + return stack:get_count() + else + return 0 + end + end, + on_put = function(inv, listname, index, stack, player) + inv:set_stack(listname, index, "") + end, +}) +trash:set_size("main", 1) + +creative.set_creative_formspec = function(player, start_i, pagenum, tab_id) + local player_name = player:get_player_name() + local filter = player_inventory[player_name].filter or "" + pagenum = math.floor(pagenum) + local pagemax = math.floor((player_inventory[player_name].size - 1) / (3*8) + 1) + tab_id = tab_id or 2 + + player:set_inventory_formspec([[ + size[8,8.6] + image[4.06,3.4;0.8,0.8;creative_trash_icon.png] + list[current_player;main;0,4.7;8,1;] + list[current_player;main;0,5.85;8,3;8] + list[detached:creative_trash;main;4,3.3;1,1;] + tablecolumns[color;text;color;text] + tableoptions[background=#00000000;highlight=#00000000;border=false] + button[5.4,3.2;0.8,0.9;creative_prev;<] + button[7.25,3.2;0.8,0.9;creative_next;>] + button[2.1,3.4;0.8,0.5;creative_search;?] + button[2.75,3.4;0.8,0.5;creative_clear;X] + tooltip[creative_search;Search] + tooltip[creative_clear;Reset] + listring[current_player;main] + ]] .. + "field[0.3,3.5;2.2,1;creative_filter;;".. filter .."]".. + "listring[detached:creative_".. player_name ..";main]".. + "tabheader[0,0;creative_tabs;Crafting,All,Nodes,Tools,Items;".. tostring(tab_id) ..";true;false]".. + "list[detached:creative_".. player_name ..";main;0,0;8,3;".. tostring(start_i) .."]".. + "table[6.05,3.35;1.15,0.5;pagenum;#FFFF00,".. tostring(pagenum) ..",#FFFFFF,/ ".. tostring(pagemax) .."]".. + default.get_hotbar_bg(0,4.7).. + default.gui_bg .. default.gui_bg_img .. default.gui_slots + ) +end + +creative.set_crafting_formspec = function(player) + player:set_inventory_formspec([[ + size[8,8.6] + list[current_player;craft;2,0.75;3,3;] + list[current_player;craftpreview;6,1.75;1,1;] + list[current_player;main;0,4.7;8,1;] + list[current_player;main;0,5.85;8,3;8] + list[detached:creative_trash;main;0,2.75;1,1;] + image[0.06,2.85;0.8,0.8;creative_trash_icon.png] + image[5,1.75;1,1;gui_furnace_arrow_bg.png^[transformR270] + tabheader[0,0;creative_tabs;Crafting,All,Nodes,Tools,Items;1;true;false] + listring[current_player;main] + listring[current_player;craft] + ]] .. + default.get_hotbar_bg(0,4.7).. + default.gui_bg .. default.gui_bg_img .. default.gui_slots + ) +end + +minetest.register_on_joinplayer(function(player) + -- If in creative mode, modify player's inventory forms + if not minetest.setting_getbool("creative_mode") then + return + end + creative.init_creative_inventory(player) + creative.set_creative_formspec(player, 0, 1, 2) +end) + +minetest.register_on_player_receive_fields(function(player, formname, fields) + if formname ~= "" or not minetest.setting_getbool("creative_mode") then + return + end + + local player_name = player:get_player_name() + local formspec = player:get_inventory_formspec() + local filter = formspec:match("creative_filter;;([%w_:]+)") or "" + local start_i = formspec:match("list%[.-".. player_name ..";.-;(%d+)%]") + local tab_id = tonumber(formspec:match("tabheader%[.-;(%d+)%;")) + local inv_size = player_inventory[player_name].size + start_i = tonumber(start_i) or 0 + + if fields.quit then + if tab_id == 1 then + creative.set_crafting_formspec(player) + end + elseif fields.creative_tabs then + local tab = tonumber(fields.creative_tabs) + if tab == 1 then + creative.set_crafting_formspec(player) + else + creative.update_creative_inventory(player_name, filter, tab) + creative.set_creative_formspec(player, 0, 1, tab) + end + elseif fields.creative_clear then + player_inventory[player_name].filter = "" + creative.update_creative_inventory(player_name, nil, tab_id) + creative.set_creative_formspec(player, 0, 1, tab_id) + elseif fields.creative_search then + local lowstr = fields.creative_filter:lower() + player_inventory[player_name].filter = lowstr + creative.update_creative_inventory(player_name, lowstr, tab_id) + creative.set_creative_formspec(player, 0, 1, tab_id) + else + if fields.creative_prev then + start_i = start_i - 3*8 + if start_i < 0 then + start_i = inv_size - (inv_size % (3*8)) + if inv_size == start_i then + start_i = math.max(0, inv_size - (3*8)) + end + end + elseif fields.creative_next then + start_i = start_i + 3*8 + if start_i >= inv_size then + start_i = 0 + end + end + + creative.set_creative_formspec(player, start_i, start_i / (3*8) + 1, tab_id) + end +end) + +if minetest.setting_getbool("creative_mode") then + local digtime = 0.5 + minetest.register_item(":", { + type = "none", + wield_image = "wieldhand.png", + wield_scale = {x=1, y=1, z=2.5}, + range = 10, + tool_capabilities = { + full_punch_interval = 0.5, + max_drop_level = 3, + groupcaps = { + crumbly = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3}, + cracky = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3}, + snappy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3}, + choppy = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3}, + oddly_breakable_by_hand = {times={[1]=digtime, [2]=digtime, [3]=digtime}, uses=0, maxlevel=3}, + }, + damage_groups = {fleshy = 10}, + } + }) + + minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack) + return true + end) + + function minetest.handle_node_drops(pos, drops, digger) + if not digger or not digger:is_player() then + return + end + local inv = digger:get_inventory() + if inv then + for _, item in ipairs(drops) do + item = ItemStack(item):get_name() + if not inv:contains_item("main", item) then + inv:add_item("main", item) + end + end + end + end +end diff --git a/mods/creative/textures/creative_trash_icon.png b/mods/creative/textures/creative_trash_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e789ad634450a5fa5227e9efd8fe804703d3eece GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E0AtzXqc3_Qw7LkED7=p zW^j0RBMrn!@^*J&=wOxg0CG4BJR*x37`TN&n2}-D90{Nxdx@v7EBgaRE>UjzKQU*6 zfkJAYE{-7_*OL=$4jfo=K;eJ8V`JyRfAY-?+|4IMbT~B5{cmn;WMp`p!KrFv-vct4 N!PC{xWt~$(69DO#EW-c* literal 0 HcmV?d00001