Use tin from MTG instead of `moreores` (#401)

Vitaliy

2018-07-21 d1b54a573c6287ea1d63b9c3f979c39058b1331a

 technic/machines/register/battery_box.lua

@@ -1,17 +1,70 @@

local digilines_path = minetest.get_modpath("digilines")

local S = technic.getter
local tube_entry = "^pipeworks_tube_connection_metallic.png"
local cable_entry = "^technic_cable_connection_overlay.png"

local fs_helpers = pipeworks.fs_helpers

technic.register_power_tool("technic:battery", 10000)
technic.register_power_tool("technic:red_energy_crystal", 50000)
technic.register_power_tool("technic:green_energy_crystal", 150000)
technic.register_power_tool("technic:blue_energy_crystal", 450000)

-- Battery recipes:
-- Tin-copper recipe:
minetest.register_craft({
   output = 'technic:battery',
   output = "technic:battery",
   recipe = {
      {'group:wood', 'default:copper_ingot', 'group:wood'},
      {'group:wood', 'moreores:tin_ingot',   'group:wood'},
      {'group:wood', 'default:copper_ingot', 'group:wood'},
      {"group:wood", "default:copper_ingot", "group:wood"},
      {"group:wood", "default:tin_ingot",    "group:wood"},
      {"group:wood", "default:copper_ingot", "group:wood"},
   }
})
-- Sulfur-lead-water recipes:
-- With sulfur lumps:
-- With water:
minetest.register_craft({
   output = "technic:battery",
   recipe = {
      {"group:wood",         "technic:sulfur_lump", "group:wood"},
      {"technic:lead_ingot", "bucket:bucket_water", "technic:lead_ingot"},
      {"group:wood",         "technic:sulfur_lump", "group:wood"},
   },
   replacements = {
      {"bucket:bucket_water", "bucket:bucket_empty"}
   }
})
-- With oil extract:
minetest.register_craft({
   output = "technic:battery",
   recipe = {
      {"group:wood",         "technic:sulfur_lump",   "group:wood"},
      {"technic:lead_ingot", "homedecor:oil_extract", "technic:lead_ingot"},
      {"group:wood",         "technic:sulfur_lump",   "group:wood"},
   }
})
-- With sulfur dust:
-- With water:
minetest.register_craft({
   output = "technic:battery",
   recipe = {
      {"group:wood",         "technic:sulfur_dust", "group:wood"},
      {"technic:lead_ingot", "bucket:bucket_water", "technic:lead_ingot"},
      {"group:wood",         "technic:sulfur_dust", "group:wood"},
   },
   replacements = {
      {"bucket:bucket_water", "bucket:bucket_empty"}
   }
})
-- With oil extract:
minetest.register_craft({
   output = "technic:battery",
   recipe = {
      {"group:wood",         "technic:sulfur_dust",   "group:wood"},
      {"technic:lead_ingot", "homedecor:oil_extract", "technic:lead_ingot"},
      {"group:wood",         "technic:sulfur_dust",   "group:wood"},
   }
})

@@ -29,59 +82,124 @@
   }
})

-- x+2 + (z+2)*2
local dirtab = {
   [4] = 2,
   [5] = 3,
   [7] = 1,
   [8] = 0
}

local tube = {
   insert_object = function(pos, node, stack, direction)
      if direction.y == 0 then
      print(minetest.pos_to_string(direction), dirtab[direction.x+2+(direction.z+2)*2], node.param2)
      if direction.y == 1
         or (direction.y == 0 and dirtab[direction.x+2+(direction.z+2)*2] == node.param2) then
         return stack
      end
      local meta = minetest.get_meta(pos)
      local inv = meta:get_inventory()
      if direction.y > 0 then
      if direction.y == 0 then
         return inv:add_item("src", stack)
      else
         return inv:add_item("dst", stack)
      end
   end,
   can_insert = function(pos, node, stack, direction)
      if direction.y == 0 then
      print(minetest.pos_to_string(direction), dirtab[direction.x+2+(direction.z+2)*2], node.param2)
      if direction.y == 1
         or (direction.y == 0 and dirtab[direction.x+2+(direction.z+2)*2] == node.param2) then
         return false
      end
      local meta = minetest.get_meta(pos)
      local inv = meta:get_inventory()
      if direction.y > 0 then
      if direction.y == 0 then
         if meta:get_int("split_src_stacks") == 1 then
            stack = stack:peek_item(1)
         end
         return inv:room_for_item("src", stack)
      else
         if meta:get_int("split_dst_stacks") == 1 then
            stack = stack:peek_item(1)
         end
         return inv:room_for_item("dst", stack)
      end
   end,
   connect_sides = {left=1, right=1, back=1, top=1, bottom=1},
   connect_sides = {left=1, right=1, back=1, top=1},
}

local function add_on_off_buttons(meta, ltier, charge_percent)
   local formspec = ""
   if ltier == "mv" or ltier == "hv" then
      formspec = "image[1,1;1,2;technic_power_meter_bg.png"
         .."^[lowpart:"..charge_percent
         ..":technic_power_meter_fg.png]"..
         fs_helpers.cycling_button(
            meta,
            "image_button[3,2.0;1,0.6",
            "split_src_stacks",
            {
               pipeworks.button_off,
               pipeworks.button_on
            }
         ).."label[3.9,2.01;Allow splitting incoming 'charge' stacks from tubes]"..
         fs_helpers.cycling_button(
            meta,
            "image_button[3,2.5;1,0.6",
            "split_dst_stacks",
            {
               pipeworks.button_off,
               pipeworks.button_on
            }
         ).."label[3.9,2.51;Allow splitting incoming 'discharge' stacks]"
   end
   return formspec
end

function technic.register_battery_box(data)
   local tier = data.tier
   local ltier = string.lower(tier)

   local formspec =
      "invsize[8,9;]"..
      "size[8,9]"..
      "image[1,1;1,2;technic_power_meter_bg.png]"..
      "list[current_name;src;3,1;1,1;]"..
      "list[context;src;3,1;1,1;]"..
      "image[4,1;1,1;technic_battery_reload.png]"..
      "list[current_name;dst;5,1;1,1;]"..
      "list[context;dst;5,1;1,1;]"..
      "label[0,0;"..S("%s Battery Box"):format(tier).."]"..
      "label[3,0;"..S("Charge").."]"..
      "label[5,0;"..S("Discharge").."]"..
      "label[1,3;"..S("Power level").."]"..
      "list[current_player;main;0,5;8,4;]"
	
      "list[current_player;main;0,5;8,4;]"..
      "listring[context;dst]"..
      "listring[current_player;main]"..
      "listring[context;src]"..
      "listring[current_player;main]"

   if digilines_path then
      formspec = formspec.."button[0.6,3.7;2,1;edit_channel;edit Channel]"
   end

   if data.upgrade then
      formspec = formspec..
         "list[current_name;upgrade1;3.5,3;1,1;]"..
         "list[current_name;upgrade2;4.5,3;1,1;]"..
         "label[3.5,4;"..S("Upgrade Slots").."]"
         "list[context;upgrade1;3.5,3;1,1;]"..
         "list[context;upgrade2;4.5,3;1,1;]"..
         "label[3.5,4;"..S("Upgrade Slots").."]"..
         "listring[context;upgrade1]"..
         "listring[current_player;main]"..
         "listring[context;upgrade2]"..
         "listring[current_player;main]"
   end

   local run = function(pos, node)
      local below = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z})
      local meta           = minetest.get_meta(pos)

      if not technic.is_tier_cable(below.name, tier) then
         meta:set_string("infotext", S("%s Battery Box Has No Network"):format(tier))
         return
      end

      local eu_input       = meta:get_int(tier.."_EU_input")
      local current_charge = meta:get_int("internal_EU_charge")

@@ -90,7 +208,7 @@
         EU_upgrade, tube_upgrade = technic.handle_machine_upgrades(meta)
      end
      local max_charge = data.max_charge * (1 + EU_upgrade / 10)
			

      -- Charge/discharge the battery with the input EUs
      if eu_input >= 0 then
         current_charge = math.min(current_charge + eu_input, max_charge)
@@ -105,7 +223,7 @@
      current_charge, tool_empty = technic.discharge_tools(meta,
            current_charge, data.discharge_step,
            max_charge)
			

      if data.tube then
         local inv = meta:get_inventory()
         technic.handle_machine_pipeworks(pos, tube_upgrade,
@@ -136,51 +254,68 @@
      end

      local charge_percent = math.floor(current_charge / max_charge * 100)
      meta:set_string("formspec",
         formspec..
         "image[1,1;1,2;technic_power_meter_bg.png"
         .."^[lowpart:"..charge_percent
         ..":technic_power_meter_fg.png]")

      local infotext = S("@1 Battery Box: @2/@3", tier,
            technic.prettynum(current_charge), technic.prettynum(max_charge))
      meta:set_string("formspec", formspec..add_on_off_buttons(meta, ltier, charge_percent))
      local infotext = S("@1 Battery Box: @2 / @3", tier,
            technic.EU_string(current_charge),
            technic.EU_string(max_charge))
      if eu_input == 0 then
         infotext = S("%s Idle"):format(infotext)
      end
      meta:set_string("infotext", infotext)
   end
	

   for i = 0, 8 do
      local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1}
      local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2,
            technic_machine=1, ["technic_"..ltier]=1}
      if i ~= 0 then
         groups.not_in_creative_inventory = 1
      end
		

      if data.tube then
         groups.tubedevice = 1
         groups.tubedevice_receiver = 1
      end
		

      local top_tex = "technic_"..ltier.."_battery_box_top.png"..tube_entry
      local front_tex = "technic_"..ltier.."_battery_box_front.png^technic_power_meter"..i..".png"
      local side_tex = "technic_"..ltier.."_battery_box_side.png"..tube_entry
      local bottom_tex = "technic_"..ltier.."_battery_box_bottom.png"..cable_entry

      if ltier == "lv" then
         top_tex = "technic_"..ltier.."_battery_box_top.png"
         front_tex = "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"
         side_tex = "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"
      end

      minetest.register_node("technic:"..ltier.."_battery_box"..i, {
         description = S("%s Battery Box"):format(tier),
         tiles = {"technic_"..ltier.."_battery_box_top.png",
                  "technic_"..ltier.."_battery_box_bottom.png",
             "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
             "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
             "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
             "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"},
         tiles = {
            top_tex,
            bottom_tex,
            side_tex,
            side_tex,
            side_tex,
            front_tex},
         groups = groups,
         connect_sides = {"bottom"},
         tube = data.tube and tube or nil,
         paramtype2 = "facedir",
         sounds = default.node_sound_wood_defaults(),
         drop = "technic:"..ltier.."_battery_box0",
         on_construct = function(pos)
            local meta = minetest.get_meta(pos)
            local EU_upgrade, tube_upgrade = 0, 0
            if data.upgrade then
               EU_upgrade, tube_upgrade = technic.handle_machine_upgrades(meta)
            end
            local max_charge = data.max_charge * (1 + EU_upgrade / 10)
            local charge = meta:get_int("internal_EU_charge")
            local cpercent = math.floor(charge / max_charge * 100)
            local inv = meta:get_inventory()
            local node = minetest.get_node(pos)

            meta:set_string("infotext", S("%s Battery Box"):format(tier))
            meta:set_string("formspec", formspec)
            meta:set_string("formspec", formspec..add_on_off_buttons(meta, ltier, cpercent))
            meta:set_string("channel", ltier.."_battery_box"..minetest.pos_to_string(pos))
            meta:set_int(tier.."_EU_demand", 0)
            meta:set_int(tier.."_EU_supply", 0)
            meta:set_int(tier.."_EU_input",  0)
@@ -195,8 +330,59 @@
         allow_metadata_inventory_take = technic.machine_inventory_take,
         allow_metadata_inventory_move = technic.machine_inventory_move,
         technic_run = run,
         on_rotate = screwdriver.rotate_simple,
         after_place_node = data.tube and pipeworks.after_place,
         after_dig_node = technic.machine_after_dig_node
         after_dig_node = technic.machine_after_dig_node,
         on_receive_fields = function(pos, formname, fields, sender)
            local meta = minetest.get_meta(pos)
            local nodename = minetest.get_node(pos).name
            if fields.edit_channel then
               minetest.show_formspec(sender:get_player_name(),
                  "technic:battery_box_edit_channel"..minetest.pos_to_string(pos),
                  "field[channel;Digiline Channel;"..meta:get_string("channel").."]")
            elseif fields["fs_helpers_cycling:0:split_src_stacks"]
              or   fields["fs_helpers_cycling:0:split_dst_stacks"]
              or   fields["fs_helpers_cycling:1:split_src_stacks"]
              or   fields["fs_helpers_cycling:1:split_dst_stacks"] then
               local meta = minetest.get_meta(pos)
               if not pipeworks.may_configure(pos, sender) then return end
               fs_helpers.on_receive_fields(pos, fields)
               local EU_upgrade, tube_upgrade = 0, 0
               if data.upgrade then
                  EU_upgrade, tube_upgrade = technic.handle_machine_upgrades(meta)
               end
               local max_charge = data.max_charge * (1 + EU_upgrade / 10)
               local charge = meta:get_int("internal_EU_charge")
               local cpercent = math.floor(charge / max_charge * 100)
               meta:set_string("formspec", formspec..add_on_off_buttons(meta, ltier, cpercent))
            end
         end,
         digiline = {
            receptor = {action = function() end},
            effector = {
               action = function(pos, node, channel, msg)
                  if msg ~= "GET" and msg ~= "get" then
                     return
                  end
                  local meta = minetest.get_meta(pos)
                  if channel ~= meta:get_string("channel") then
                     return
                  end
                  local inv = meta:get_inventory()
                  digilines.receptor_send(pos, digilines.rules.default, channel, {
                     demand = meta:get_int(tier.."_EU_demand"),
                     supply = meta:get_int(tier.."_EU_supply"),
                     input  = meta:get_int(tier.."_EU_input"),
                     charge = meta:get_int("internal_EU_charge"),
                     max_charge = data.max_charge * (1 + technic.handle_machine_upgrades(meta) / 10),
                     src      = inv:get_stack("src", 1):to_table(),
                     dst      = inv:get_stack("dst", 1):to_table(),
                     upgrade1 = inv:get_stack("upgrade1", 1):to_table(),
                     upgrade2 = inv:get_stack("upgrade2", 1):to_table()
                  })
               end
            },
         },
      })
   end

@@ -208,6 +394,22 @@

end -- End registration

minetest.register_on_player_receive_fields(
   function(player, formname, fields)
      if formname:sub(1, 32) ~= "technic:battery_box_edit_channel" or
            not fields.channel then
         return
      end
      local pos = minetest.string_to_pos(formname:sub(33))
      local plname = player:get_player_name()
      if minetest.is_protected(pos, plname) then
         minetest.record_protection_violation(pos, plname)
         return
      end
      local meta = minetest.get_meta(pos)
      meta:set_string("channel", fields.channel)
   end
)

function technic.charge_tools(meta, batt_charge, charge_step)
   local inv = meta:get_inventory()