major overhaul to boblogistics support

add ub- prefix to UltimateBelts-derived data, to avoid conflict
with boblogistics rename to ultimate-transport-belt and related.
Double speed of miniloader inserters in general.

data-updates.lua

@@ -0,0 +1,27 @@
+-- boblogistics does some late changes in the data-updates phase, so we need to react to them here
+
+local function update(prefix)
+  local loader = data.raw["loader"][prefix .. "miniloader-loader"]
+  local loader_item = data.raw["item"][prefix .. "miniloader"]
+  local filter_loader = data.raw["loader"][prefix .. "filter-miniloader-loader"]
+  local filter_loader_item = data.raw["item"][prefix .. "filter-miniloader"]
+  prefix = string.gsub(prefix, "^ub%-", "")
+  local base_underground = data.raw["underground-belt"][prefix .. "underground-belt"]
+  local base_underground_item = data.raw["item"][prefix .. "underground-belt"]
+
+  loader.speed = base_underground.speed
+  loader_item.subgroup = base_underground_item.subgroup
+  filter_loader.speed = base_underground.speed
+  filter_loader_item.subgroup = base_underground_item.subgroup
+end
+
+update("")
+update("fast-")
+update("express-")
+
+if data.raw["underground-belt"]["turbo-underground-belt"] then
+  update("turbo-")
+end
+if data.raw["underground-belt"]["ultimate-underground-belt"] then
+  update("ultimate-")
+end

data.lua

@@ -22,63 +22,67 @@ local ingredients = {
   },
 
   -- boblogistics
-  ["green-miniloader"] = {
+  ["turbo-miniloader"] = {
     {"express-miniloader", 1},
-    {"green-underground-belt", 1},
+    {"turbo-underground-belt", 1},
     {"express-stack-inserter", 4},
   },
-  ["purple-miniloader"] = {
-    {"green-miniloader", 1},
-    {"purple-underground-belt", 1},
+  ["ultimate-miniloader"] = {
+    {"turbo-miniloader", 1},
+    {"ultimate-underground-belt", 1},
     {"express-stack-inserter", 2},
   },
 
-  --UltimateBelts
-  ["ultra-fast-miniloader"] = {
+  -- UltimateBelts
+  ["ub-ultra-fast-miniloader"] = {
     {"express-miniloader", 1},
     {"ultra-fast-underground-belt", 1},
     {"stack-inserter", 6},
   },
-  ["extreme-fast-miniloader"] = {
-    {"ultra-fast-miniloader", 1},
+  ["ub-extreme-fast-miniloader"] = {
+    {"ub-ultra-fast-miniloader", 1},
     {"extreme-fast-underground-belt", 1},
     {"stack-inserter", 6},
   },
-  ["ultra-express-miniloader"] = {
-    {"extreme-fast-miniloader", 1},
+  ["ub-ultra-express-miniloader"] = {
+    {"ub-extreme-fast-miniloader", 1},
     {"ultra-express-underground-belt", 1},
     {"stack-inserter", 6},
   },
-  ["extreme-express-miniloader"] = {
-    {"ultra-express-miniloader", 1},
+  ["ub-extreme-express-miniloader"] = {
+    {"ub-ultra-express-miniloader", 1},
     {"extreme-express-underground-belt", 1},
     {"stack-inserter", 6},
   },
-  ["ultimate-miniloader"] = {
-    {"extreme-express-miniloader", 1},
+  ["ub-ultimate-miniloader"] = {
+    {"ub-extreme-express-miniloader", 1},
     {"ultimate-underground-belt", 1},
     {"stack-inserter", 6},
   },
 }
 
-if data.raw["inserter"]["green-inserter"] then
+if data.raw["inserter"]["turbo-inserter"] then
   ingredients["miniloader"][3] = {"inserter", 8}
   ingredients["fast-miniloader"][3] = {"long-handed-inserter", 8}
   ingredients["express-miniloader"][3] = {"fast-inserter", 6}
-  ingredients["green-miniloader"][3] = {"green-inserter", 6}
-  ingredients["purple-miniloader"][3] = {"express-inserter", 6}
+  ingredients["turbo-miniloader"][3] = {"turbo-inserter", 6}
+  ingredients["ultimate-miniloader"][3] = {"express-inserter", 6}
 end
 
 local previous_miniloader = {
   ["fast-"] = "",
   ["express-"] = "fast-",
-  ["green-"] = "express-",
-  ["purple-"] = "green-",
-  ["ultra-fast-"] = "express-",
-  ["extreme-fast-"] = "ultra-fast-",
-  ["ultra-express-"] = "extreme-fast-",
-  ["extreme-express-"] = "ultra-express-",
-  ["ultimate-"] = "extreme-express-",
+
+  -- boblogistics
+  ["turbo-"] = "express-",
+  ["ultimate-"] = "turbo-",
+
+  -- UltimateBelts
+  ["ub-ultra-fast-"] = "express-",
+  ["ub-extreme-fast-"] = "ub-ultra-fast-",
+  ["ub-ultra-express-"] = "ub-extreme-fast-",
+  ["ub-extreme-express-"] = "ub-ultra-express-",
+  ["ub-ultimate-"] = "ub-extreme-express-",
 }
 
 local filter_inserters = {
@@ -89,7 +93,7 @@ local filter_inserters = {
   -- boblogistics overhaul
   ["inserter"] = "yellow-filter-inserter",
   ["long-handed-inserter"] = "red-filter-inserter",
-  ["green-inserter"] = "green-filter-inserter",
+  ["turbo-inserter"] = "turbo-filter-inserter",
   ["express-inserter"] = "express-filter-inserter",
 }
 
@@ -104,6 +108,7 @@ local empty_sheet = {
 -- underground belt solely for the purpose of migrations from pre-1.4.0 versions
 local function create_legacy_underground(prefix)
   local name = prefix .. "miniloader-legacy-underground"
+  prefix = string.gsub(prefix, "^ub%-", "")
 
   local entity = {}
   entity.type = "underground-belt"
@@ -135,6 +140,7 @@ local function create_loaders(prefix)
   local loader_name = prefix .. "miniloader"
   local filter_loader_name = prefix .. "filter-miniloader"
   local name = loader_name .. "-loader"
+  prefix = string.gsub(prefix, "^ub%-", "")
 
   local entity = util.table.deepcopy(data.raw["underground-belt"][prefix .. "underground-belt"])
   entity.type = "loader"
@@ -189,6 +195,7 @@ end
 local function create_items(prefix)
   local name = prefix .. "miniloader"
   local filter_name = prefix .. "filter-miniloader"
+  prefix = string.gsub(prefix, "^ub%-", "")
 
   local item = util.table.deepcopy(data.raw.item[prefix .. "underground-belt"])
   item.name = name
@@ -201,7 +208,7 @@ local function create_items(prefix)
   filter_item.name = filter_name
   filter_item.localised_name = {"entity-name." .. filter_name}
   filter_item.icon = "__miniloader__/graphics/item/" .. filter_name ..".png"
-  filter_item.order, _ = string.gsub(item.order, "^e%[miniloader%]", "f[filter-miniloader]", 1)
+  filter_item.order, _ = string.gsub(item.order, "$", "-filter", 1)
   filter_item.place_result = filter_name .. "-inserter"
 
   data:extend{
@@ -240,6 +247,7 @@ end
 local function create_technology(prefix, tech_prereqs)
   local name = prefix .. "miniloader"
   local filter_name = prefix .. "filter-miniloader"
+  prefix = string.gsub(prefix, "^ub%-", "")
 
   local main_prereq = data.raw["technology"][tech_prereqs[1]]
   local technology = {
@@ -282,12 +290,13 @@ local connector_definitions = circuit_connector_definitions.create(
 )
 
 local function create_inserters(prefix)
-  local base_entity = data.raw["underground-belt"][prefix .. "underground-belt"]
   local loader_name = prefix .. "miniloader"
   local name = loader_name .. "-inserter"
   local filter_loader_name = prefix .. "filter-miniloader"
   local filter_name = filter_loader_name .. "-inserter"
-  local speed = base_entity.speed * 0.2 / 0.03125
+  prefix = string.gsub(prefix, "^ub%-", "")
+  local base_entity = data.raw["underground-belt"][prefix .. "underground-belt"]
+  local speed = base_entity.speed * 0.4 / 0.03125
 
   local loader_inserter = {
     type = "inserter",
@@ -300,8 +309,8 @@ local function create_inserters(prefix)
     collision_box = {{-0.2, -0.2}, {0.2, 0.2}},
     selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
     allow_custom_vectors = true,
-    energy_per_movement = 4000,
-    energy_per_rotation = 4000,
+    energy_per_movement = 2000,
+    energy_per_rotation = 2000,
     energy_source = {
       type = "electric",
       usage_priority = "secondary-input",
@@ -359,17 +368,17 @@ create_miniloader("express-", {"logistics-3", "fast-miniloader"})
 
 -- Bob's support
 if data.raw.technology["bob-logistics-4"] then
-  create_miniloader("green-", {"bob-logistics-4", "express-miniloader"})
+  create_miniloader("turbo-", {"bob-logistics-4", "express-miniloader"})
   if data.raw.technology["bob-logistics-5"] then
-    create_miniloader("purple-", {"bob-logistics-5", "green-miniloader"})
+    create_miniloader("ultimate-", {"bob-logistics-5", "turbo-miniloader"})
   end
 end
 
 -- UltimateBelts support
 if data.raw.technology["ultimate-logistics"] then
-  create_miniloader("ultra-fast-", {"ultra-fast-logistics", "express-miniloader"})
-  create_miniloader("extreme-fast-", {"extreme-fast-logistics", "ultra-fast-miniloader"})
-  create_miniloader("ultra-express-", {"ultra-express-logistics", "extreme-fast-miniloader"})
-  create_miniloader("extreme-express-", {"extreme-express-logistics", "ultra-express-miniloader"})
-  create_miniloader("ultimate-", {"ultimate-logistics", "extreme-express-miniloader"})
+  create_miniloader("ub-ultra-fast-", {"ultra-fast-logistics", "express-miniloader"})
+  create_miniloader("ub-extreme-fast-", {"extreme-fast-logistics", "ub-ultra-fast-miniloader"})
+  create_miniloader("ub-ultra-express-", {"ultra-express-logistics", "ub-extreme-fast-miniloader"})
+  create_miniloader("ub-extreme-express-", {"extreme-express-logistics", "ub-ultra-express-miniloader"})
+  create_miniloader("ub-ultimate-", {"ultimate-logistics", "ub-extreme-express-miniloader"})
 end

locale/en/miniloader.cfg

@@ -2,48 +2,48 @@
 miniloader=Miniloader
 fast-miniloader=Fast miniloader
 express-miniloader=Express miniloader
-green-miniloader=Turbo miniloader
-purple-miniloader=Ultimate miniloader
-ultra-fast-miniloader=Ultra fast miniloader
-extreme-fast-miniloader=Extreme fast miniloader
-ultra-express-miniloader=Ultra express miniloader
-extreme-express-miniloader=Extreme express miniloader
+turbo-miniloader=Turbo miniloader
 ultimate-miniloader=Ultimate miniloader
+ub-ultra-fast-miniloader=Ultra fast miniloader
+ub-extreme-fast-miniloader=Extreme fast miniloader
+ub-ultra-express-miniloader=Ultra express miniloader
+ub-extreme-express-miniloader=Extreme express miniloader
+ub-ultimate-miniloader=Ultimate miniloader
 
 filter-miniloader=Filter miniloader
 fast-filter-miniloader=Fast filter miniloader
 express-filter-miniloader=Express filter miniloader
-green-filter-miniloader=Turbo filter miniloader
-purple-filter-miniloader=Ultimate filter miniloader
-ultra-fast-filter-miniloader=Ultra fast filter miniloader
-extreme-fast-filter-miniloader=Extreme fast filter miniloader
-ultra-express-filter-miniloader=Ultra express filter miniloader
-extreme-express-filter-miniloader=Extreme express filter miniloader
+turbo-filter-miniloader=Turbo filter miniloader
 ultimate-filter-miniloader=Ultimate filter miniloader
+ub-ultra-fast-filter-miniloader=Ultra fast filter miniloader
+ub-extreme-fast-filter-miniloader=Extreme fast filter miniloader
+ub-ultra-express-filter-miniloader=Ultra express filter miniloader
+ub-extreme-express-filter-miniloader=Extreme express filter miniloader
+ub-ultimate-filter-miniloader=Ultimate filter miniloader
 
 [technology-name]
 miniloader=Miniloader
 fast-miniloader=Fast miniloader
 express-miniloader=Express miniloader
-green-miniloader=Turbo miniloader
-purple-miniloader=Ultimate miniloader
-ultra-fast-miniloader=Ultra fast miniloader
-extreme-fast-miniloader=Extreme fast miniloader
-ultra-express-miniloader=Ultra express miniloader
-extreme-express-miniloader=Extreme express miniloader
+turbo-miniloader=Turbo miniloader
 ultimate-miniloader=Ultimate miniloader
+ub-ultra-fast-miniloader=Ultra fast miniloader
+ub-extreme-fast-miniloader=Extreme fast miniloader
+ub-ultra-express-miniloader=Ultra express miniloader
+ub-extreme-express-miniloader=Extreme express miniloader
+ub-ultimate-miniloader=Ultimate miniloader
 
 [technology-description]
 miniloader=Miniloader
 fast-miniloader=Fast miniloader
 express-miniloader=Express miniloader
-green-miniloader=Turbo miniloader
-purple-miniloader=Ultimate miniloader
-ultra-fast-miniloader=Ultra fast miniloader
-extreme-fast-miniloader=Extreme fast miniloader
-ultra-express-miniloader=Ultra express miniloader
-extreme-express-miniloader=Extreme express miniloader
+turbo-miniloader=Turbo miniloader
 ultimate-miniloader=Ultimate miniloader
+ub-ultra-fast-miniloader=Ultra fast miniloader
+ub-extreme-fast-miniloader=Extreme fast miniloader
+ub-ultra-express-miniloader=Ultra express miniloader
+ub-extreme-express-miniloader=Extreme express miniloader
+ub-ultimate-miniloader=Ultimate miniloader
 
 [mod-setting-name]
 miniloader-snapping=Snap miniloaders

migrations/1_5_16-1_5_17.json

@@ -0,0 +1,77 @@
+{
+    "entity": [
+        ["green-miniloader-loader", "turbo-miniloader-loader"],
+        ["green-filter-miniloader-loader", "turbo-filter-miniloader-loader"],
+        ["green-miniloader-inserter", "turbo-miniloader-inserter"],
+        ["green-filter-miniloader-inserter", "turbo-filter-miniloader-inserter"],
+        ["purple-miniloader-loader", "ultimate-miniloader-loader"],
+        ["purple-filter-miniloader-loader", "ultimate-filter-miniloader-loader"],
+        ["purple-miniloader-inserter", "ultimate-miniloader-inserter"],
+        ["purple-filter-miniloader-inserter", "ultimate-filter-miniloader-inserter"],
+
+        ["ultra-fast-miniloader", "ub-ultra-fast-miniloader"],
+        ["ultra-fast-filter-miniloader", "ub-ultra-fast-filter-miniloader"],
+        ["ultra-fast-miniloader-inserter", "ub-ultra-fast-miniloader-inserter"],
+        ["ultra-fast-filter-miniloader-inserter", "ub-ultra-fast-filter-miniloader-inserter"],
+        ["extreme-fast-miniloader", "ub-extreme-fast-miniloader"],
+        ["extreme-fast-filter-miniloader", "ub-extreme-fast-filter-miniloader"],
+        ["extreme-fast-miniloader-inserter", "ub-extreme-fast-miniloader-inserter"],
+        ["extreme-fast-filter-miniloader-inserter", "ub-extreme-fast-filter-miniloader-inserter"],
+        ["ultra-express-miniloader", "ub-ultra-express-miniloader"],
+        ["ultra-express-filter-miniloader", "ub-ultra-express-filter-miniloader"],
+        ["ultra-express-miniloader-inserter", "ub-ultra-express-miniloader-inserter"],
+        ["ultra-express-filter-miniloader-inserter", "ub-ultra-express-filter-miniloader-inserter"],
+        ["extreme-express-miniloader", "ub-extreme-express-miniloader"],
+        ["extreme-express-filter-miniloader", "ub-extreme-express-filter-miniloader"],
+        ["extreme-express-miniloader-inserter", "ub-extreme-express-miniloader-inserter"],
+        ["extreme-express-filter-miniloader-inserter", "ub-extreme-express-filter-miniloader-inserter"],
+        ["ultimate-miniloader", "ub-ultimate-miniloader"],
+        ["ultimate-filter-miniloader", "ub-ultimate-filter-miniloader"],
+        ["ultimate-miniloader-inserter", "ub-ultimate-miniloader-inserter"],
+        ["ultimate-filter-miniloader-inserter", "ub-ultimate-filter-miniloader-inserter"]
+    ],
+    "item": [
+        ["green-miniloader", "turbo-miniloader"],
+        ["green-filter-miniloader", "turbo-filter-miniloader"],
+        ["purple-miniloader", "ultimate-miniloader"],
+        ["purple-filter-miniloader", "ultimate-filter-miniloader"],
+
+        ["ultra-fast-miniloader", "ub-ultra-fast-miniloader"],
+        ["ultra-fast-filter-miniloader", "ub-ultra-fast-filter-miniloader"],
+        ["extreme-fast-miniloader", "ub-extreme-fast-miniloader"],
+        ["extreme-fast-filter-miniloader", "ub-extreme-fast-filter-miniloader"],
+        ["ultra-express-miniloader", "ub-ultra-express-miniloader"],
+        ["ultra-express-filter-miniloader", "ub-ultra-express-filter-miniloader"],
+        ["extreme-express-miniloader", "ub-extreme-express-miniloader"],
+        ["extreme-express-filter-miniloader", "ub-extreme-express-filter-miniloader"],
+        ["ultimate-miniloader", "ub-ultimate-miniloader"],
+        ["ultimate-filter-miniloader", "ub-ultimate-filter-miniloader"]
+    ],
+    "recipe": [
+        ["green-miniloader", "turbo-miniloader"],
+        ["green-filter-miniloader", "turbo-filter-miniloader"],
+        ["purple-miniloader", "ultimate-miniloader"],
+        ["purple-filter-miniloader", "ultimate-filter-miniloader"],
+
+        ["ultra-fast-miniloader", "ub-ultra-fast-miniloader"],
+        ["ultra-fast-filter-miniloader", "ub-ultra-fast-filter-miniloader"],
+        ["extreme-fast-miniloader", "ub-extreme-fast-miniloader"],
+        ["extreme-fast-filter-miniloader", "ub-extreme-fast-filter-miniloader"],
+        ["ultra-express-miniloader", "ub-ultra-express-miniloader"],
+        ["ultra-express-filter-miniloader", "ub-ultra-express-filter-miniloader"],
+        ["extreme-express-miniloader", "ub-extreme-express-miniloader"],
+        ["extreme-express-filter-miniloader", "ub-extreme-express-filter-miniloader"],
+        ["ultimate-miniloader", "ub-ultimate-miniloader"],
+        ["ultimate-filter-miniloader", "ub-ultimate-filter-miniloader"]
+    ],
+    "technology": [
+        ["green-miniloader", "turbo-miniloader"],
+        ["purple-miniloader", "ultimate-miniloader"],
+
+        ["ultra-fast-miniloader", "ub-ultra-fast-miniloader"],
+        ["extreme-fast-miniloader", "ub-extreme-fast-miniloader"],
+        ["ultra-express-miniloader", "ub-ultra-express-miniloader"],
+        ["extreme-express-miniloader", "ub-extreme-express-miniloader"],
+        ["ultimate-miniloader", "ub-ultimate-miniloader"]
+    ]
+}