From 8d22c92b577bb891b0629483e379aa950061b4cf Mon Sep 17 00:00:00 2001
From: Qatavin <108201496+Qatavin@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:01:06 -0800
Subject: [PATCH] Bob's Assembly 2.0 super final polish (#234)

* advanced-electronics-3 -> advanced-processing-unit

* advanced-electronics-3 -> advanced-processing-unit

* advanced-electronics-3 -> advanced-processing-unit

* advanced-electronics-3 -> advanced-processing-unit

* advanced-electronics-3 -> advanced-processing-unit

* advanced-electronics-3 -> advanced-processing-unit

* advanced-electronics-3 -> advanced-processing-unit

* advanced-electronics-3 -> advanced-processing-unit

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing

* Update icon drawing and electrolyser circuit connectors, add "smelting" to chem furnaces

* Update icon drawing

* advanced-electronics-3 -> advanced-processing-unit

* Add advanced processing unit tech locale

* Update tech icons

* Update tech icons

* Update tech icons

* Migrate advanced-electronics-3 -> advanced-processing-unit

* Add quality to all

* Add quality to electrolyser, electric furnaces

* Update icon drawing

* Check quality feature flag rather than quality mod

* Remove smelting category from chemical furnaces

---------

Co-authored-by: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
---
 bobassembly/data.lua                          | 32 +++++++++
 bobassembly/prototypes/assembly-burner.lua    |  7 ++
 .../assembly-electronics-updates.lua          |  2 +-
 .../prototypes/assembly-electronics.lua       | 28 +++++++-
 bobassembly/prototypes/assembly-updates.lua   |  2 +-
 bobassembly/prototypes/assembly.lua           | 20 +++---
 bobassembly/prototypes/centrifuge-updates.lua |  2 +-
 bobassembly/prototypes/centrifuge.lua         |  8 +++
 .../chemical-mixing-furnace-updates.lua       |  2 +-
 .../prototypes/chemical-mixing-furnace.lua    | 12 +++-
 .../prototypes/chemical-plant-updates.lua     |  2 +-
 bobassembly/prototypes/chemical-plant.lua     | 25 +++++++
 bobassembly/prototypes/distillery.lua         | 27 ++++++++
 .../prototypes/electric-furnace-updates.lua   |  2 +-
 bobassembly/prototypes/electric-furnace.lua   | 15 ++++-
 .../prototypes/electrolyser-updates.lua       |  2 +-
 bobassembly/prototypes/electrolyser.lua       | 67 +++++++++++--------
 bobassembly/prototypes/fluid-furnace.lua      | 11 ++-
 .../prototypes/oil-refinery-updates.lua       |  2 +-
 bobassembly/prototypes/oil-refinery.lua       |  7 ++
 bobplates/data.lua                            |  6 ++
 bobplates/locale/en/bobplates.cfg             |  1 +
 bobplates/migrations/bobplates_1.3.0.json     |  6 ++
 bobplates/prototypes/distillery.lua           | 12 ++++
 bobplates/prototypes/entity/entities.lua      | 58 +++++++++++++---
 bobplates/prototypes/entity/pumps.lua         | 52 ++++++++++++--
 bobplates/prototypes/technology.lua           | 24 ++++---
 27 files changed, 354 insertions(+), 80 deletions(-)
 create mode 100644 bobplates/migrations/bobplates_1.3.0.json

diff --git a/bobassembly/data.lua b/bobassembly/data.lua
index 9216c0d2a..d4fac889c 100644
--- a/bobassembly/data.lua
+++ b/bobassembly/data.lua
@@ -16,3 +16,35 @@ require("prototypes.chemical-mixing-furnace")
 require("prototypes.distillery")
 require("prototypes.fluid-furnace")
 require("prototypes.centrifuge")
+
+if feature_flags["quality"] then
+  if data.raw["assembling-machine"]["assembling-machine-6"] then
+    table.insert(data.raw["assembling-machine"]["assembling-machine-4"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["assembling-machine-5"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["assembling-machine-6"].allowed_effects, "quality")
+  end
+  if data.raw["assembling-machine"]["electronics-machine-3"] then
+    table.insert(data.raw["assembling-machine"]["electronics-machine-1"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["electronics-machine-2"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["electronics-machine-3"].allowed_effects, "quality")
+  end
+  if data.raw["assembling-machine"]["chemical-plant-4"] then
+    table.insert(data.raw["assembling-machine"]["chemical-plant-2"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["chemical-plant-3"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["chemical-plant-4"].allowed_effects, "quality")
+  end
+  if data.raw.furnace["electric-furnace-3"] then
+    table.insert(data.raw.furnace["electric-furnace-2"].allowed_effects, "quality")
+    table.insert(data.raw.furnace["electric-furnace-3"].allowed_effects, "quality")
+  end
+  if data.raw["assembling-machine"]["electrolyser-5"] then
+    table.insert(data.raw["assembling-machine"]["electrolyser-2"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["electrolyser-3"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["electrolyser-4"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["electrolyser-5"].allowed_effects, "quality")
+  end
+  if data.raw["assembling-machine"]["electric-chemical-mixing-furnace-2"] then
+    table.insert(data.raw["assembling-machine"]["electric-chemical-mixing-furnace"].allowed_effects, "quality")
+    table.insert(data.raw["assembling-machine"]["electric-chemical-mixing-furnace-2"].allowed_effects, "quality")
+  end
+end
diff --git a/bobassembly/prototypes/assembly-burner.lua b/bobassembly/prototypes/assembly-burner.lua
index e612ce78c..e0a4cfc71 100644
--- a/bobassembly/prototypes/assembly-burner.lua
+++ b/bobassembly/prototypes/assembly-burner.lua
@@ -158,6 +158,10 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
         },
       },
       energy_usage = "60kW",
+      icon_draw_specification = {
+        scale = 0.66,
+        shift = { 0, -0.15 }
+      },
       allowed_effects = {},
     },
 
@@ -324,6 +328,9 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
         },
       },
       energy_usage = "300kW",
+      icon_draw_specification = {
+        shift = { 0, -0.3 }
+      },
       allowed_effects = {},
     },
 
diff --git a/bobassembly/prototypes/assembly-electronics-updates.lua b/bobassembly/prototypes/assembly-electronics-updates.lua
index ed4c24819..fbdda9737 100644
--- a/bobassembly/prototypes/assembly-electronics-updates.lua
+++ b/bobassembly/prototypes/assembly-electronics-updates.lua
@@ -59,7 +59,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
   end
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("electronics-machine-3", "processing-unit", "advanced-processing-unit")
-    bobmods.lib.tech.add_prerequisite("electronics-machine-3", "advanced-electronics-3")
+    bobmods.lib.tech.add_prerequisite("electronics-machine-3", "advanced-processing-unit")
   end
 
   if settings.startup["bobmods-assembly-limits"].value == true then
diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua
index fae7d3631..77c482a98 100644
--- a/bobassembly/prototypes/assembly-electronics.lua
+++ b/bobassembly/prototypes/assembly-electronics.lua
@@ -152,6 +152,18 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       },
       energy_usage = "100kW",
       module_slots = 2,
+      icons_positioning = {
+        {
+          inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.5 },
+          scale = 0.4,
+          multi_row_initial_height_modifier = -0.3,
+        },
+      },
+      icon_draw_specification = {
+        scale = 0.66,
+        shift = { 0, -0.15 }
+      },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
     },
 
@@ -318,9 +330,16 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       icons_positioning = {
         {
           inventory_index = defines.inventory.assembling_machine_modules,
-          max_icons_per_row = 3,
+          shift = { 0, 0.7 },
+          scale = 0.4,
+          multi_row_initial_height_modifier = -0.3,
+          max_icons_per_row = 2,
         },
       },
+      icon_draw_specification = {
+        scale = 0.66,
+        shift = { 0, -0.15 }
+      },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
     },
 
@@ -491,9 +510,16 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       icons_positioning = {
         {
           inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.7 },
+          scale = 0.4,
+          multi_row_initial_height_modifier = -0.3,
           max_icons_per_row = 3,
         },
       },
+      icon_draw_specification = {
+        scale = 0.66,
+        shift = { 0, -0.15 }
+      },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
     },
 
diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua
index c90a58cea..453649677 100644
--- a/bobassembly/prototypes/assembly-updates.lua
+++ b/bobassembly/prototypes/assembly-updates.lua
@@ -123,7 +123,7 @@ end
 
 if data.raw.item["advanced-processing-unit"] then
   bobmods.lib.recipe.replace_ingredient("assembling-machine-5", "processing-unit", "advanced-processing-unit")
-  bobmods.lib.tech.add_prerequisite("automation-5", "advanced-electronics-3")
+  bobmods.lib.tech.add_prerequisite("automation-5", "advanced-processing-unit")
   bobmods.lib.recipe.replace_ingredient("assembling-machine-6", "processing-unit", "advanced-processing-unit")
 end
 
diff --git a/bobassembly/prototypes/assembly.lua b/bobassembly/prototypes/assembly.lua
index bec8ebd94..f71798bbb 100644
--- a/bobassembly/prototypes/assembly.lua
+++ b/bobassembly/prototypes/assembly.lua
@@ -141,12 +141,8 @@ data:extend({
     },
     energy_usage = "300kW",
     module_slots = 4,
-    icons_positioning = {
-      {
-        inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
-        multi_row_initial_height_modifier = -0.3,
-      },
+    icon_draw_specification = {
+      shift = { 0, -0.3 }
     },
     allowed_effects = { "consumption", "speed", "productivity", "pollution" },
   },
@@ -324,10 +320,14 @@ data:extend({
     icons_positioning = {
       {
         inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
+        shift = { 0, 0.8 },
         multi_row_initial_height_modifier = -0.3,
+        max_icons_per_row = 3,
       },
     },
+    icon_draw_specification = {
+      shift = { 0, -0.3 }
+    },
     allowed_effects = { "consumption", "speed", "productivity", "pollution" },
   },
 
@@ -503,10 +503,14 @@ data:extend({
     icons_positioning = {
       {
         inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
+        shift = { 0, 0.8 },
         multi_row_initial_height_modifier = -0.3,
+        max_icons_per_row = 3,
       },
     },
+    icon_draw_specification = {
+      shift = { 0, -0.3 }
+    },
     allowed_effects = { "consumption", "speed", "productivity", "pollution" },
   },
 
diff --git a/bobassembly/prototypes/centrifuge-updates.lua b/bobassembly/prototypes/centrifuge-updates.lua
index ee8563f27..96635ffa9 100644
--- a/bobassembly/prototypes/centrifuge-updates.lua
+++ b/bobassembly/prototypes/centrifuge-updates.lua
@@ -29,7 +29,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("centrifuge-3", "processing-unit", "advanced-processing-unit")
-    bobmods.lib.tech.add_prerequisite("centrifuge-3", "advanced-electronics-3")
+    bobmods.lib.tech.add_prerequisite("centrifuge-3", "advanced-processing-unit")
   end
 
   if data.raw.item["nitinol-gear-wheel"] then
diff --git a/bobassembly/prototypes/centrifuge.lua b/bobassembly/prototypes/centrifuge.lua
index d6f1ab797..510e21e16 100644
--- a/bobassembly/prototypes/centrifuge.lua
+++ b/bobassembly/prototypes/centrifuge.lua
@@ -106,6 +106,14 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
         energy_usage = "1050kW",
         energy_source = { emissions_per_minute = { pollution = 2 } },
         module_slots = 6,
+        icons_positioning = {
+          {
+            inventory_index = defines.inventory.assembling_machine_modules,
+            shift = { 0, 0.8 },
+            multi_row_initial_height_modifier = -0.3,
+            max_icons_per_row = 3
+          },
+        },
       },
     }),
 
diff --git a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua
index 6d7b197fd..4cb3be2b4 100644
--- a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua
+++ b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua
@@ -48,7 +48,7 @@ then
       "processing-unit",
       "advanced-processing-unit"
     )
-    bobmods.lib.tech.add_prerequisite("multi-purpose-furnace-2", "advanced-electronics-3")
+    bobmods.lib.tech.add_prerequisite("multi-purpose-furnace-2", "advanced-processing-unit")
   end
 
   if settings.startup["bobmods-assembly-limits"].value == true then
diff --git a/bobassembly/prototypes/chemical-mixing-furnace.lua b/bobassembly/prototypes/chemical-mixing-furnace.lua
index 99a1e2cf4..f3b486065 100644
--- a/bobassembly/prototypes/chemical-mixing-furnace.lua
+++ b/bobassembly/prototypes/chemical-mixing-furnace.lua
@@ -176,10 +176,12 @@ then
       icons_positioning = {
         {
           inventory_index = defines.inventory.assembling_machine_modules,
-          shift = { 0, 0.5 },
-          multi_row_initial_height_modifier = -0.3,
+          shift = { 0, 0.8 },
         },
       },
+      icon_draw_specification = {
+        shift = { 0, -0.1 }
+      },
       crafting_speed = 3,
       crafting_categories = { "smelting", "mixing-furnace", "chemical-furnace" },
       energy_usage = "250kW",
@@ -246,10 +248,14 @@ then
       icons_positioning = {
         {
           inventory_index = defines.inventory.assembling_machine_modules,
-          shift = { 0, 0.5 },
+          shift = { 0, 0.8 },
           multi_row_initial_height_modifier = -0.3,
+          max_icons_per_row = 3
         },
       },
+      icon_draw_specification = {
+        shift = { 0, -0.1 }
+      },
       crafting_speed = 4,
       crafting_categories = { "smelting", "mixing-furnace", "chemical-furnace" },
       energy_usage = "300kW",
diff --git a/bobassembly/prototypes/chemical-plant-updates.lua b/bobassembly/prototypes/chemical-plant-updates.lua
index 012f2c21c..d63f2bdef 100644
--- a/bobassembly/prototypes/chemical-plant-updates.lua
+++ b/bobassembly/prototypes/chemical-plant-updates.lua
@@ -67,7 +67,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
   end
 
   if data.raw.item["advanced-processing-unit"] then
-    bobmods.lib.tech.add_prerequisite("chemical-plant-4", "advanced-electronics-3")
+    bobmods.lib.tech.add_prerequisite("chemical-plant-4", "advanced-processing-unit")
   end
 
   if settings.startup["bobmods-assembly-limits"].value == true then
diff --git a/bobassembly/prototypes/chemical-plant.lua b/bobassembly/prototypes/chemical-plant.lua
index 2640054d8..3214108eb 100644
--- a/bobassembly/prototypes/chemical-plant.lua
+++ b/bobassembly/prototypes/chemical-plant.lua
@@ -233,6 +233,9 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
       module_slots = 4,
+      icon_draw_specification = {
+        shift = { 0, -0.3 }
+      },
       crafting_speed = 1.75,
       energy_usage = "260kW",
       energy_source = {
@@ -269,6 +272,17 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
       module_slots = 5,
+      icons_positioning = {
+        {
+          inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.8 },
+          multi_row_initial_height_modifier = -0.3,
+          max_icons_per_row = 3,
+        },
+      },
+      icon_draw_specification = {
+        shift = { 0, -0.3 }
+      },
       crafting_speed = 2.75,
       energy_usage = "390kW",
       energy_source = {
@@ -305,6 +319,17 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
       module_slots = 6,
+      icons_positioning = {
+        {
+          inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.8 },
+          multi_row_initial_height_modifier = -0.3,
+          max_icons_per_row = 3,
+        },
+      },
+      icon_draw_specification = {
+        shift = { 0, -0.3 }
+      },
       crafting_speed = 3.5,
       energy_usage = "480kW",
       energy_source = {
diff --git a/bobassembly/prototypes/distillery.lua b/bobassembly/prototypes/distillery.lua
index 1e5276570..6aedcaba4 100644
--- a/bobassembly/prototypes/distillery.lua
+++ b/bobassembly/prototypes/distillery.lua
@@ -202,6 +202,15 @@ then
         crafting_speed = 2.1,
         energy_usage = "205kW",
         module_slots = 3,
+        icons_positioning = {
+          {
+            inventory_index = defines.inventory.assembling_machine_modules,
+            shift = { 0, 0.7 },
+            scale = 0.4,
+            multi_row_initial_height_modifier = -0.3,
+            max_icons_per_row = 2,
+          },
+        },
         next_upgrade = "bob-distillery-4",
       },
     }),
@@ -224,6 +233,15 @@ then
         crafting_speed = 2.8,
         energy_usage = "242kW",
         module_slots = 4,
+        icons_positioning = {
+          {
+            inventory_index = defines.inventory.assembling_machine_modules,
+            shift = { 0, 0.7 },
+            scale = 0.4,
+            multi_row_initial_height_modifier = -0.3,
+            max_icons_per_row = 2,
+          },
+        },
         next_upgrade = "bob-distillery-5",
       },
     }),
@@ -246,6 +264,15 @@ then
         crafting_speed = 3.5,
         energy_usage = "270kW",
         module_slots = 5,
+        icons_positioning = {
+          {
+            inventory_index = defines.inventory.assembling_machine_modules,
+            shift = { 0, 0.7 },
+            scale = 0.4,
+            multi_row_initial_height_modifier = -0.3,
+            max_icons_per_row = 3,
+          },
+        },
       },
     }),
 
diff --git a/bobassembly/prototypes/electric-furnace-updates.lua b/bobassembly/prototypes/electric-furnace-updates.lua
index 96e5c50c6..d08310bf4 100644
--- a/bobassembly/prototypes/electric-furnace-updates.lua
+++ b/bobassembly/prototypes/electric-furnace-updates.lua
@@ -24,6 +24,6 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("electric-furnace-3", "processing-unit", "advanced-processing-unit")
-    bobmods.lib.tech.add_prerequisite("advanced-material-processing-4", "advanced-electronics-3")
+    bobmods.lib.tech.add_prerequisite("advanced-material-processing-4", "advanced-processing-unit")
   end
 end
diff --git a/bobassembly/prototypes/electric-furnace.lua b/bobassembly/prototypes/electric-furnace.lua
index 998b72fbc..4a37a3184 100644
--- a/bobassembly/prototypes/electric-furnace.lua
+++ b/bobassembly/prototypes/electric-furnace.lua
@@ -77,7 +77,7 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
   end
 
   local function bob_electric_furnace(input)
-    return {
+    local prototype = {
       type = "furnace",
       name = input.name,
       icon = input.icon,
@@ -100,9 +100,11 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
         {
           inventory_index = defines.inventory.assembling_machine_modules,
           shift = { 0, 0.8 },
-          multi_row_initial_height_modifier = -0.3,
         },
       },
+      icon_draw_specification = {
+        shift = { 0, -0.1 }
+      },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
       crafting_categories = { "smelting" },
       result_inventory_size = 1,
@@ -128,6 +130,15 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
       },
       fast_replaceable_group = "furnace",
     }
+
+    if input.module_slots == 5 or input.module_slots == 6 then
+      prototype.icons_positioning[1].max_icons_per_row = 3
+    end
+    if input.module_slots > 4 then
+      prototype.icons_positioning[1].multi_row_initial_height_modifier = -0.3
+    end
+
+    return prototype
   end
 
   data.raw.item["electric-furnace"].order = "c[electric-furnace-1]"
diff --git a/bobassembly/prototypes/electrolyser-updates.lua b/bobassembly/prototypes/electrolyser-updates.lua
index ca85146f7..794d4a5f5 100644
--- a/bobassembly/prototypes/electrolyser-updates.lua
+++ b/bobassembly/prototypes/electrolyser-updates.lua
@@ -79,7 +79,7 @@ then
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("electrolyser-5", "processing-unit", "advanced-processing-unit")
-    bobmods.lib.tech.add_prerequisite("electrolyser-5", "advanced-electronics-3")
+    bobmods.lib.tech.add_prerequisite("electrolyser-5", "advanced-processing-unit")
   end
 
   if data.raw.item["copper-tungsten-pipe"] then
diff --git a/bobassembly/prototypes/electrolyser.lua b/bobassembly/prototypes/electrolyser.lua
index e216eb759..1a9938e44 100644
--- a/bobassembly/prototypes/electrolyser.lua
+++ b/bobassembly/prototypes/electrolyser.lua
@@ -103,33 +103,6 @@ then
     }
   end
 
-  circuit_connector_definitions["electrolyser"] =
-    circuit_connector_definitions.create_vector(universal_connector_template, {
-      {
-        variation = 8,
-        main_offset = util.by_pixel(-12, -34),
-        shadow_offset = util.by_pixel(39, 31),
-        show_shadow = false,
-      },
-      {
-        variation = 6,
-        main_offset = util.by_pixel(0, -19),
-        shadow_offset = util.by_pixel(39, 31),
-        show_shadow = false,
-      },
-      {
-        variation = 8,
-        main_offset = util.by_pixel(-12, -41),
-        shadow_offset = util.by_pixel(39, 31),
-        show_shadow = false,
-      },
-      {
-        variation = 2,
-        main_offset = util.by_pixel(0, -25),
-        shadow_offset = util.by_pixel(39, 31),
-        show_shadow = false,
-      },
-    })
 
   data:extend({
     {
@@ -303,6 +276,15 @@ then
       crafting_categories = { "electrolysis" },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
       module_slots = 3,
+      icons_positioning = {
+        {
+          inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.8 },
+        },
+      },
+      icon_draw_specification = {
+        shift = { 0, -0.3 }
+      },
       crafting_speed = 1.25,
       energy_usage = "650kW",
       energy_source = {
@@ -340,6 +322,15 @@ then
       crafting_categories = { "electrolysis" },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
       module_slots = 4,
+      icons_positioning = {
+        {
+          inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.8 },
+        },
+      },
+      icon_draw_specification = {
+        shift = { 0, -0.3 }
+      },
       crafting_speed = 2,
       energy_usage = "960kW",
       energy_source = {
@@ -377,6 +368,17 @@ then
       crafting_categories = { "electrolysis" },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
       module_slots = 5,
+      icons_positioning = {
+        {
+          inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.8 },
+          multi_row_initial_height_modifier = -0.3,
+          max_icons_per_row = 3
+        },
+      },
+      icon_draw_specification = {
+        shift = { 0, -0.3 }
+      },
       crafting_speed = 2.75,
       energy_usage = "1210kW",
       energy_source = {
@@ -413,6 +415,17 @@ then
       crafting_categories = { "electrolysis" },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
       module_slots = 6,
+      icons_positioning = {
+        {
+          inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.8 },
+          multi_row_initial_height_modifier = -0.3,
+          max_icons_per_row = 3
+        },
+      },
+      icon_draw_specification = {
+        shift = { 0, -0.3 }
+      },
       crafting_speed = 3.5,
       energy_usage = "1400kW",
       energy_source = {
diff --git a/bobassembly/prototypes/fluid-furnace.lua b/bobassembly/prototypes/fluid-furnace.lua
index f0051a6b2..2fa584f2d 100644
--- a/bobassembly/prototypes/fluid-furnace.lua
+++ b/bobassembly/prototypes/fluid-furnace.lua
@@ -170,16 +170,16 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
       {
         type = "technology",
         name = "fluid-mixing-furnace",
-        icon_size = 128,
         icons = {
           {
             icon = "__base__/graphics/technology/advanced-material-processing.png",
             icon_size = 256,
           },
           {
-            icon = "__bobassembly__/graphics/icons/technology/alloy-processing.png",
+            icon = "__bobassembly_/graphics/icons/technology/alloy-processing.png",
             icon_size = 128,
-            shift = { -64, -64 },
+            scale = 0.5,
+            shift = { -48, -48 },
           },
         },
         prerequisites = {
@@ -314,7 +314,6 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
       {
         type = "technology",
         name = "fluid-chemical-furnace",
-        icon_size = 128,
         icons = {
           {
             icon = "__base__/graphics/technology/advanced-material-processing.png",
@@ -323,8 +322,8 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then
           {
             icon = "__bobassembly__/graphics/icons/technology/chemistry.png",
             icon_size = 64,
-            scale = 2,
-            shift = { -64, -64 },
+            scale = 1,
+            shift = { -48, -48 },
           },
         },
         prerequisites = {
diff --git a/bobassembly/prototypes/oil-refinery-updates.lua b/bobassembly/prototypes/oil-refinery-updates.lua
index af98f5074..e2960cdc7 100644
--- a/bobassembly/prototypes/oil-refinery-updates.lua
+++ b/bobassembly/prototypes/oil-refinery-updates.lua
@@ -104,6 +104,6 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("oil-refinery-4", "processing-unit", "advanced-processing-unit")
-    bobmods.lib.tech.add_prerequisite("oil-processing-4", "advanced-electronics-3")
+    bobmods.lib.tech.add_prerequisite("oil-processing-4", "advanced-processing-unit")
   end
 end
diff --git a/bobassembly/prototypes/oil-refinery.lua b/bobassembly/prototypes/oil-refinery.lua
index 5ccc950bd..b7ee1b650 100644
--- a/bobassembly/prototypes/oil-refinery.lua
+++ b/bobassembly/prototypes/oil-refinery.lua
@@ -12,6 +12,13 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
   data.raw.item["oil-refinery"].subgroup = "bob-refinery-machine"
   data.raw["assembling-machine"]["oil-refinery"].fast_replaceable_group = "oil-refinery"
 
+  data.raw["assembling-machine"]["oil-refinery"].icons_positioning = {
+    {
+      inventory_index = defines.inventory.assembling_machine_modules,
+      shift = { 0, 1 },
+    },
+  }
+
   data:extend({
     {
       type = "item",
diff --git a/bobplates/data.lua b/bobplates/data.lua
index ed4053e86..6ffdf912b 100644
--- a/bobplates/data.lua
+++ b/bobplates/data.lua
@@ -86,3 +86,9 @@ require("prototypes.technology-nuclear")
 require("prototypes.item.alien")
 require("prototypes.recipe.alien-recipe")
 require("prototypes.technology-alien")
+
+if feature_flags["quality"] then
+  table.insert(data.raw["assembling-machine"].electrolyser.allowed_effects, "quality")
+  table.insert(data.raw["assembling-machine"]["electric-chemical-furnace"].allowed_effects, "quality")
+  table.insert(data.raw["assembling-machine"]["electric-mixing-furnace"].allowed_effects, "quality")
+end
diff --git a/bobplates/locale/en/bobplates.cfg b/bobplates/locale/en/bobplates.cfg
index af38070bb..e48d409c9 100644
--- a/bobplates/locale/en/bobplates.cfg
+++ b/bobplates/locale/en/bobplates.cfg
@@ -290,6 +290,7 @@ alloy-processing=Alloy processing
 chemical-processing=Chemical processing
 electrolysis=Electrolysis
 bob-wood-processing=Wood processing
+advanced-processing-unit=Advanced processing unit
 
 aluminium-processing=Aluminium processing
 gold-processing=Gold processing
diff --git a/bobplates/migrations/bobplates_1.3.0.json b/bobplates/migrations/bobplates_1.3.0.json
new file mode 100644
index 000000000..b4ef81e28
--- /dev/null
+++ b/bobplates/migrations/bobplates_1.3.0.json
@@ -0,0 +1,6 @@
+{
+  "technology":
+  [
+    ["advanced-electronics-3", "advanced-processing-unit"]
+  ]
+}
\ No newline at end of file
diff --git a/bobplates/prototypes/distillery.lua b/bobplates/prototypes/distillery.lua
index 162cff7ad..6de511203 100644
--- a/bobplates/prototypes/distillery.lua
+++ b/bobplates/prototypes/distillery.lua
@@ -454,6 +454,18 @@ if settings.startup["bobmods-plates-purewater"].value == true then
       },
       allowed_effects = { "consumption", "speed", "pollution" },
       module_slots = 1,
+      icons_positioning = {
+        {
+          inventory_index = defines.inventory.assembling_machine_modules,
+          shift = { 0, 0.5 },
+          scale = 0.4,
+          multi_row_initial_height_modifier = -0.3,
+        },
+      },
+      icon_draw_specification = {
+        scale = 0.66,
+        shift = { 0, -0.25 }
+      },
       working_sound = {
         sound = {
           filename = "__base__/sound/boiler.ogg",
diff --git a/bobplates/prototypes/entity/entities.lua b/bobplates/prototypes/entity/entities.lua
index e625ce0fc..884f15b42 100644
--- a/bobplates/prototypes/entity/entities.lua
+++ b/bobplates/prototypes/entity/entities.lua
@@ -59,20 +59,30 @@ end
 
 circuit_connector_definitions["electrolyser"] =
   circuit_connector_definitions.create_vector(universal_connector_template, {
+    {
+      variation = 12,
+      main_offset = util.by_pixel(12, -34),
+      shadow_offset = util.by_pixel(57, 4),
+      show_shadow = true,
+    },
+    {
+      variation = 12,
+      main_offset = util.by_pixel(12, -38),
+      shadow_offset = util.by_pixel(57, 8),
+      show_shadow = true,
+    },
     {
       variation = 8,
-      main_offset = util.by_pixel(-12, -34),
+      main_offset = util.by_pixel(-10.5, -42),
       shadow_offset = util.by_pixel(39, 31),
       show_shadow = false,
     },
-    { variation = 6, main_offset = util.by_pixel(0, -19), shadow_offset = util.by_pixel(39, 31), show_shadow = false },
     {
       variation = 8,
-      main_offset = util.by_pixel(-12, -41),
+      main_offset = util.by_pixel(-11, -38),
       shadow_offset = util.by_pixel(39, 31),
       show_shadow = false,
     },
-    { variation = 2, main_offset = util.by_pixel(0, -25), shadow_offset = util.by_pixel(39, 31), show_shadow = false },
   })
 
 circuit_connector_definitions["electric-furnace"] =
@@ -101,6 +111,15 @@ data:extend({
     crafting_categories = { "electrolysis" },
     allowed_effects = { "consumption", "speed", "productivity", "pollution" },
     module_slots = 1,
+    icons_positioning = {
+      {
+        inventory_index = defines.inventory.assembling_machine_modules,
+        shift = { 0, 0.8 },
+      },
+    },
+    icon_draw_specification = {
+      shift = { 0, -0.3 }
+    },
     crafting_speed = 0.75,
     energy_usage = "420kW",
     energy_source = {
@@ -186,6 +205,10 @@ data:extend({
     forced_symmetry = "vertical",
     collision_box = { { -0.7, -0.7 }, { 0.7, 0.7 } },
     selection_box = { { -1, -1 }, { 1, 1 } },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.1 }
+    },
     crafting_categories = { "chemical-furnace" },
     energy_usage = "90kW",
     energy_source = {
@@ -358,6 +381,10 @@ data:extend({
     forced_symmetry = "vertical",
     collision_box = { { -0.7, -0.7 }, { 0.7, 0.7 } },
     selection_box = { { -1, -1 }, { 1, 1 } },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.1 }
+    },
     crafting_categories = { "chemical-furnace" },
     energy_usage = "90kW",
     energy_source = {
@@ -412,17 +439,18 @@ data:extend({
     fluid_boxes_off_when_no_fluid_recipe = true,
     collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
     selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
-
     module_slots = 2,
     icons_positioning = {
       {
         inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
-        multi_row_initial_height_modifier = -0.3,
+        shift = { 0, 0.8 },
       },
     },
+    icon_draw_specification = {
+      shift = { 0, -0.1 }
+    },
     crafting_speed = 2,
-    crafting_categories = { "smelting", "chemical-furnace" },
+    crafting_categories = { "chemical-furnace" },
     energy_usage = "180kW",
     energy_source = {
       type = "electric",
@@ -499,6 +527,10 @@ data:extend({
     },
     collision_box = { { -0.7, -0.7 }, { 0.7, 0.7 } },
     selection_box = { { -0.8, -1 }, { 0.8, 1 } },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.1 }
+    },
     crafting_categories = { "smelting", "mixing-furnace" },
     energy_usage = "90kW",
     crafting_speed = 1,
@@ -568,6 +600,10 @@ data:extend({
     },
     collision_box = { { -0.7, -0.7 }, { 0.7, 0.7 } },
     selection_box = { { -0.8, -1 }, { 0.8, 1 } },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.1 }
+    },
     crafting_categories = { "smelting", "mixing-furnace" },
     energy_usage = "90kW",
     crafting_speed = 2,
@@ -615,10 +651,12 @@ data:extend({
     icons_positioning = {
       {
         inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
-        multi_row_initial_height_modifier = -0.3,
+        shift = { 0, 0.8 },
       },
     },
+    icon_draw_specification = {
+      shift = { 0, -0.1 }
+    },
     crafting_speed = 2,
     crafting_categories = { "smelting", "mixing-furnace" },
     energy_usage = "180kW",
diff --git a/bobplates/prototypes/entity/pumps.lua b/bobplates/prototypes/entity/pumps.lua
index f672dc74b..b4c14a91c 100644
--- a/bobplates/prototypes/entity/pumps.lua
+++ b/bobplates/prototypes/entity/pumps.lua
@@ -100,9 +100,14 @@ data:extend({
       {
         inventory_index = defines.inventory.assembling_machine_modules,
         shift = { 0, 0.5 },
+        scale = 0.4,
         multi_row_initial_height_modifier = -0.3,
       },
     },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.15 }
+    },
     allowed_effects = { "consumption", "speed", "pollution" },
     fast_replaceable_group = "air-pump",
     next_upgrade = "air-pump-2",
@@ -161,9 +166,14 @@ data:extend({
       {
         inventory_index = defines.inventory.assembling_machine_modules,
         shift = { 0, 0.5 },
+        scale = 0.4,
         multi_row_initial_height_modifier = -0.3,
       },
     },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.15 }
+    },
     allowed_effects = { "consumption", "speed", "pollution" },
     fast_replaceable_group = "air-pump",
     next_upgrade = "air-pump-3",
@@ -221,10 +231,16 @@ data:extend({
     icons_positioning = {
       {
         inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
+        shift = { 0, 0.7 },
+        scale = 0.4,
         multi_row_initial_height_modifier = -0.3,
+        max_icons_per_row = 2,
       },
     },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.15 }
+    },
     allowed_effects = { "consumption", "speed", "pollution" },
     fast_replaceable_group = "air-pump",
     next_upgrade = "air-pump-4",
@@ -282,10 +298,16 @@ data:extend({
     icons_positioning = {
       {
         inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
+        shift = { 0, 0.7 },
+        scale = 0.4,
         multi_row_initial_height_modifier = -0.3,
+        max_icons_per_row = 3,
       },
     },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.15 }
+    },
     allowed_effects = { "consumption", "speed", "pollution" },
     fast_replaceable_group = "air-pump",
     corpse = "small-remnants",
@@ -343,9 +365,14 @@ data:extend({
       {
         inventory_index = defines.inventory.assembling_machine_modules,
         shift = { 0, 0.5 },
+        scale = 0.4,
         multi_row_initial_height_modifier = -0.3,
       },
     },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.15 }
+    },
     allowed_effects = { "consumption", "speed", "pollution" },
     fast_replaceable_group = "water-pump",
     next_upgrade = "water-pump-2",
@@ -404,9 +431,14 @@ data:extend({
       {
         inventory_index = defines.inventory.assembling_machine_modules,
         shift = { 0, 0.5 },
+        scale = 0.4,
         multi_row_initial_height_modifier = -0.3,
       },
     },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.15 }
+    },
     allowed_effects = { "consumption", "speed", "pollution" },
     fast_replaceable_group = "water-pump",
     next_upgrade = "water-pump-3",
@@ -464,10 +496,16 @@ data:extend({
     icons_positioning = {
       {
         inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
+        shift = { 0, 0.7 },
+        scale = 0.4,
         multi_row_initial_height_modifier = -0.3,
+        max_icons_per_row = 2,
       },
     },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.15 }
+    },
     allowed_effects = { "consumption", "speed", "pollution" },
     fast_replaceable_group = "water-pump",
     next_upgrade = "water-pump-4",
@@ -525,10 +563,16 @@ data:extend({
     icons_positioning = {
       {
         inventory_index = defines.inventory.assembling_machine_modules,
-        shift = { 0, 0.5 },
+        shift = { 0, 0.7 },
+        scale = 0.4,
         multi_row_initial_height_modifier = -0.3,
+        max_icons_per_row = 3,
       },
     },
+    icon_draw_specification = {
+      scale = 0.66,
+      shift = { 0, -0.15 }
+    },
     allowed_effects = { "consumption", "speed", "pollution" },
     fast_replaceable_group = "water-pump",
     corpse = "small-remnants",
diff --git a/bobplates/prototypes/technology.lua b/bobplates/prototypes/technology.lua
index 3286b615d..cc27bed91 100644
--- a/bobplates/prototypes/technology.lua
+++ b/bobplates/prototypes/technology.lua
@@ -146,8 +146,8 @@ data:extend({
       {
         icon = "__bobplates__/graphics/icons/technology/chemistry.png",
         icon_size = 64,
-        scale = 2,
-        shift = { -64, -64 },
+        scale = 1,
+        shift = { -48, -48 },
       },
     },
     prerequisites = {
@@ -176,14 +176,14 @@ data:extend({
     name = "electric-chemical-furnace",
     icons = {
       {
-        icon = "__base__/graphics/technology/advanced-material-processing.png",
+        icon = "__base__/graphics/technology/advanced-material-processing-2.png",
         icon_size = 256,
       },
       {
         icon = "__bobplates__/graphics/icons/technology/chemistry.png",
         icon_size = 64,
-        scale = 2,
-        shift = { -64, -64 },
+        scale = 1,
+        shift = { -32, -32 },
       },
     },
     prerequisites = {
@@ -245,7 +245,8 @@ data:extend({
       {
         icon = "__bobplates__/graphics/icons/technology/alloy-processing.png",
         icon_size = 128,
-        shift = { -64, -64 },
+        scale = 0.5,
+        shift = { -48, -48 },
       },
     },
     prerequisites = {
@@ -274,13 +275,14 @@ data:extend({
     name = "electric-mixing-furnace",
     icons = {
       {
-        icon = "__base__/graphics/technology/advanced-material-processing.png",
+        icon = "__base__/graphics/technology/advanced-material-processing-2.png",
         icon_size = 256,
       },
       {
         icon = "__bobplates__/graphics/icons/technology/alloy-processing.png",
         icon_size = 128,
-        shift = { -64, -64 },
+        scale = 0.5,
+        shift = { -32, -32 },
       },
     },
     prerequisites = {
@@ -468,7 +470,7 @@ data:extend({
       "air-compressor-3",
       "nitinol-processing",
       "electric-engine",
-      "advanced-electronics-3",
+      "advanced-processing-unit",
     },
     effects = {
       {
@@ -577,7 +579,7 @@ data:extend({
       "water-bore-3",
       "nitinol-processing",
       "electric-engine",
-      "advanced-electronics-3",
+      "advanced-processing-unit",
     },
     effects = {
       {
@@ -903,7 +905,7 @@ data:extend({
 
   {
     type = "technology",
-    name = "advanced-electronics-3",
+    name = "advanced-processing-unit",
     icon = "__bobplates__/graphics/icons/technology/advanced-electronics-3.png",
     icon_size = 128,
     prerequisites = {