remove metatechnology to figure out allowed recipes

remove unused stuff

Author: Choumiko

README.md

@@ -11,6 +11,10 @@ Notes:
 
 ***
 ###Changelog
+0.2.2
+
+- requires Factorio 0.13.12
+
 0.2.1
 
 - check for module-inserter item when area is selected

control.lua

@@ -8,27 +8,14 @@ require "gui"
 
 MOD_NAME = "ModuleInserter"
 
-types = {["mining-drill"]=true,["assembling-machine"]=true,lab=true, ["rocket-silo"] = true, furnace=true, beacon=true}
-
 typeToSlot = {}
 typeToSlot.lab = defines.inventory.lab_modules
 typeToSlot["assembling-machine"] = defines.inventory.assembling_machine_modules
 typeToSlot["mining-drill"] = defines.inventory.mining_drill_modules
-typeToSlot["furnace"] = defines.inventory.assembling_machine_modules --TODO 0.13 change to furnace_modules
+typeToSlot["furnace"] = defines.inventory.furnace_modules --TODO 0.13 change to furnace_modules
 typeToSlot["rocket-silo"] = defines.inventory.assembling_machine_modules
 typeToSlot["beacon"] = 1
 
-function subPos(p1,p2)
-  p2 = p2 or {x=0,y=0}
-  return {x=p1.x-p2.x, y=p1.y-p2.y}
-end
-
-function expandPos(pos, range)
-  range = range or 0.5
-  if not pos or not pos.x then error("invalid pos",3) end
-  return {{pos.x - range, pos.y - range}, {pos.x + range, pos.y + range}}
-end
-
 function entityKey(ent)
   if ent.position and ent.direction then
     return ent.position.x..":"..ent.position.y--..":"..ent.direction
@@ -45,7 +32,7 @@ function count_keys(hashmap)
 end
 
 --/c game.player.print(serpent.dump(game.player.surface.find_logistic_network_by_position(game.player.position, game.player.force.name).find_cell_closest_to(game.player.position)))
-function hasPocketBots(player)
+local function hasPocketBots(player)
   local logisticCell = player.character.logistic_cell
   local port = false
   if logisticCell and logisticCell.transmitting and logisticCell.mobile then
@@ -156,17 +143,15 @@ function on_player_selected_area(event)
                   player.print("Can't insert "..module.." in "..entity.name)
                   valid_modules = false
                 end
-                if global.productivityAllowed and entity.type == "assembling-machine" then
-                  if entity.recipe and not global.productivityAllowed[entity.recipe.name] == true then
-                    player.print("Can't use "..module.." with recipe: " .. entity.recipe.name)
-                    valid_modules = false
-                  end
+                if entity.type == "assembling-machine" and entity.recipe and next(prototype.limitations) and not prototype.limitations[entity.recipe] then
+                  player.print({"", "Can't use ", module.localised_name, " with recipe: ", entity.recipe.localised_name})
+                  valid_modules = false
                 end
               end
             end
           end
-          local inventory = entity.get_inventory(typeToSlot[entity.type])
-          local contents = inventory.get_contents()
+
+          local contents = entity.get_inventory(typeToSlot[entity.type]).get_contents()
           if valid_modules and not util.table.compare(cTable,contents) then
             -- proxy entity that the robots fly to
             local new_entity = {
@@ -177,13 +162,13 @@ function on_player_selected_area(event)
               force = entity.force
             }
             --game.player.surface.create_entity{name = "item-request-proxy", position = game.player.selected.position, force = game.player.force, target = game.player.selected, modules={{item="speed-module-3", count=2}}}
---                        local module_proxy = {
---                          name = "item-request-proxy",
---                          position = game.player.selected.position,
---                          force = game.player.force,
---                          target = game.player.selected,
---                          request_filters = {count=2, item="speed-module-3"}
---                        }
+            --                        local module_proxy = {
+            --                          name = "item-request-proxy",
+            --                          position = game.player.selected.position,
+            --                          force = game.player.force,
+            --                          target = game.player.selected,
+            --                          request_filters = {count=2, item="speed-module-3"}
+            --                        }
 
             local key = entityKey(new_entity)
             if global.entitiesToInsert[key] then
@@ -253,12 +238,6 @@ local function getMetaItemData()
     global.nameToSlots[ent.name] = ent.amount
   end
 
-  game.forces.player.technologies["mi-meta-productivityRecipes"].reload()
-  productivityRecipes = game.forces.player.technologies["mi-meta-productivityRecipes"].effects
-  global.productivityAllowed = #productivityRecipes > 0 and global.productivityAllowed or false
-  for _, recipe in pairs(productivityRecipes) do
-    global.productivityAllowed[recipe.recipe] = true
-  end
 end
 
 local function remove_invalid_items()
@@ -320,7 +299,6 @@ local function init_global()
   global["config-tmp"] = global["config-tmp"] or {}
   global["storage"] = global["storage"] or {}
   global.nameToSlots = global.nameToSlots or {}
-  global.productivityAllowed = global.productivityAllowed or {}
   global.settings = global.settings or {}
 end
 
@@ -439,6 +417,10 @@ local function on_configuration_changed(data)
         end
         on_load()
       end
+      
+      if oldVersion < "0.2.2" then
+        global.productivityAllowed = nil
+      end
       global.version = newVersion
       --mod was updated
       -- update/change gui for all players via game.players.gui ?
@@ -467,17 +449,6 @@ script.on_event(defines.events.on_player_created, on_player_created)
 script.on_event(defines.events.on_force_created, on_force_created)
 script.on_event(defines.events.on_forces_merging, on_forces_merging)
 
-function get_config_item(player, index, type1)
-  if not global["config-tmp"][player.index]
-    or index > #global["config-tmp"][player.index]
-    or global["config-tmp"][player.index][index][type1] == "" or type(global["config-tmp"][player.index][index][type1]) == "table" then
-
-    return {"upgrade-planner-item-not-set"}
-
-  end
-  return game.item_prototypes[global["config-tmp"][player.index][index][type1]].localised_name
-end
-
 script.on_event(defines.events.on_robot_built_entity, function(event)
   local status, err = pcall(function()
     local entity = event.created_entity
@@ -588,10 +559,7 @@ script.on_event(defines.events.on_research_finished, function(event)
       gui_init(player, true)
     end
   end
-  if event.research.name == 'mi-meta-productivityRecipes' then
-    event.research.force.technologies["mi-meta-productivityRecipes"].enabled = false
-    event.research.force.technologies["mi-meta-productivityRecipes"].researched = false
-  end
+
 end)
 
 function debugDump(var, force)
@@ -619,10 +587,7 @@ remote.add_interface("mi",
     saveVar = function(name)
       saveVar(global, name)
     end,
-    limits = function()
-      debugDump(productivityAllowed,true)
-      debugDump(productivityRecipes,true)
-    end,
+   
     init = function()
       init_global()
       init_players()

data-final-fixes.lua

@@ -9,13 +9,6 @@ metarecipe.ingredients = {}
 metarecipe.enabled = false
 metarecipe.hidden = true
 
-local metaProductivityRecipesR = copyPrototype("technology", "automated-construction", "mi-meta-productivityRecipes")
-metaProductivityRecipesR.ingredients = {}
-metaProductivityRecipesR.enabled = false
-metaProductivityRecipesR.hidden = true
-metaProductivityRecipesR.effects = {}
-
-
 for t, _ in pairs(types) do
   for _, ent in pairs(data.raw[t]) do
     if type(ent.module_specification) == "table" and type(ent.module_specification.module_slots) == "number" then
@@ -60,8 +53,6 @@ for t, _ in pairs(types) do
 end
 data:extend({metaitem, metarecipe})
 
-local tmpTable = {}
-
 for k,prototype in pairs(data.raw["module"]) do
   local style =
     {
@@ -94,20 +85,9 @@ for k,prototype in pairs(data.raw["module"]) do
         height = 32
       }
     }
-  -- get allowed recipes for module
-  if prototype.limitation and type(prototype.limitation) == "table" then
-    for _, recipe in pairs(prototype.limitation) do
-      tmpTable[recipe] = true
-    end
-  end
   data.raw["gui-style"].default["mi-icon-"..prototype.name] = style
 end
 
-for r,_ in pairs(tmpTable) do
-  table.insert(metaProductivityRecipesR.effects, {type="unlock-recipe", recipe=r})
-end
-data:extend({metaProductivityRecipesR})
-
 data.raw["gui-style"].default["mi-icon-style"] =
   {
     type = "checkbox_style",

gui.lua

@@ -1,92 +1,3 @@
-GUI = {
-  styleprefix = "st_",
-
-  defaultStyles = {
-    label = "label",
-    button = "button",
-    checkbox = "checkbox"
-  },
-
-  windows = {
-    root = "stGui",
-    settings = {"settings"},
-    trainInfo = {"trainInfo"}},
-
-  position = "left",
-
-  new = function(index, player)
-    local new = {}
-    setmetatable(new, {__index=GUI})
-    return new
-  end,
-
-  destroyGui = function (guiA)
-    if guiA ~= nil and guiA.valid then
-      guiA.destroy()
-    end
-  end,
-
-  add = function(parent, e, bind)
-    local type = e.type
-    if not e.style and (type == "button" or type == "label") then
-      e.style = "st_"..type
-    end
-    if bind then
-      if type == "checkbox" then
-        e.state = global[bind]
-      end
-    end
-    if type == "checkbox" and not (e.state == true or e.state == false) then
-      e.state = false
-    end
-    return parent.add(e)
-  end,
-
-  addButton = function(parent, e, bind)
-    e.type="button"
-    return GUI.add(parent, e, bind)
-  end,
-
-  addLabel = function(parent, e_, bind)
-    local e = e_
-    if type1(e) == "string" or type1(e) == "number" or (type1(e) == "table" and e[1]) then
-      e = {caption=e}
-    end
-    e.type="label"
-    return GUI.add(parent,e,bind)
-  end,
-
-  addTextfield = function(parent, e, bind)
-    e.type="textfield"
-    return GUI.add(parent, e, bind)
-  end,
-
-  addPlaceHolder = function(parent, count)
-    local c = count or 1
-    for i=1,c do
-      GUI.add(parent, {type="label", caption=""})
-    end
-  end,
-
-  sanitizeName = function(name_)
-    local name = string.gsub(name_, "_", " ")
-    name = string.gsub(name, "^%s", "")
-    name = string.gsub(name, "%s$", "")
-    local pattern = "(%w+)__([%w%s%-%#%!%$]*)_*([%w%s%-%#%!%$]*)_*(%w*)"
-    local element = "activeLine__"..name.."__".."something"
-    local t1, t2, t3, _ = element:match(pattern)
-    if t1 == "activeLine" and t2 == name and t3 == "something" then
-      return name
-    else
-      return false
-    end
-  end,
-
-  sanitizeNumber = function(number, default)
-    return tonumber(number) or default
-  end
-}
-
 function gui_init(player, after_research)
   if not player.gui.top["module-inserter-config-button"]
     and (player.force.technologies["automated-construction"].researched or after_research) then
@@ -135,7 +46,7 @@ function gui_open_frame(player)
   if remote.interfaces.YARM and remote.interfaces.YARM.hide_expando then
     global.settings[player.index].YARM_old_expando = remote.call("YARM", "hide_expando", player.index)
   end
-  -- Now we can build the GUI.
+  -- Now we can build the GUI
   frame = player.gui.left.add{
     type = "frame",
     caption = {"module-inserter-config-frame-title"},

info.json

@@ -5,6 +5,6 @@
   "title": "Module Inserter",
   "author": "Choumiko",
   "homepage": "",
-  "dependencies": ["base >= 0.13.0"],
+  "dependencies": ["base >= 0.13.12"],
   "description": "Mass insert modules into machines with pocket bots"
 }