multiple duplicate plate issues fixed

Arch666Angel · May 30, 2021 · e5c0b6c · e5c0b6c
1 parent dca74af
commit e5c0b6c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt
@@ -4,6 +4,9 @@ Date: ??
   Bugfixes:
     - Component mode:
       - Fixed ingredient tier of puffer and biter refugium
+      - Fixed tin plate could not be inserted into the filter inserter recipe
+      - Fixed glass plate could not be inserted into any solar recipe
+      - Fixed bobs recipe for the superiour circuit board was not hidden correctly
 ---------------------------------------------------------------------------------------------------
 Version: 0.4.12
 Date: 26.05.2021

diff --git a/...tries/prototypes/overrides/components-base-entity-update/components-base-power-update.lua b/...tries/prototypes/overrides/components-base-entity-update/components-base-power-update.lua
@@ -15,7 +15,7 @@ if angelsmods.industries.components then
           {type = "item", name = "block-construction-2", amount = 2},
           {type = "item", name = "block-electronics-2", amount = 2},
           {type = "item", name = "block-energy-2", amount = 3},
-          angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 5} or nil,
+          angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 5} or nil,
         }
       }
     }

diff --git a/...s/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua b/...s/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua
@@ -15,7 +15,7 @@ if angelsmods.industries.components then
               {type = "item", name = "inserter", amount = 1},
               {type = "item", name = "circuit-grey", amount = 2},
               angelsmods.trigger.smelting_products["tin"].plate and
-                {type = "item", name = "angels-plate-tin", amount = 2} or nil
+                {type = "item", name = data.raw.item["tin-plate"] and "tin-plate" or "angels-plate-tin", amount = 2} or nil
             }
           },
           {

diff --git a/...tries/prototypes/overrides/components-bobs-entity-update/components-bobs-power-update.lua b/...tries/prototypes/overrides/components-bobs-entity-update/components-bobs-power-update.lua
@@ -17,7 +17,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-3", amount = 1},
               {type = "item", name = "block-electronics-3", amount = 1},
               {type = "item", name = "block-energy-3", amount = 2},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 2} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 2} or nil,
             }
           },
           --{
@@ -28,7 +28,7 @@ if angelsmods.industries.components then
           --    {type = "item", name = "block-construction-3", amount = 2},
           --    {type = "item", name = "block-electronics-3", amount = 2},
           --    {type = "item", name = "block-energy-3", amount = 3},
-          --    angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 5} or nil,
+          --    angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 5} or nil,
           --  }
           --},
           {
@@ -38,7 +38,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-3", amount = 3},
               {type = "item", name = "block-electronics-3", amount = 3},
               {type = "item", name = "block-energy-3", amount = 4},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 7} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 7} or nil,
             }
           },
 
@@ -50,7 +50,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-4", amount = 1},
               {type = "item", name = "block-electronics-4", amount = 1},
               {type = "item", name = "block-energy-4", amount = 2},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 2} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 2} or nil,
             }
           },
           {
@@ -61,7 +61,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-4", amount = 2},
               {type = "item", name = "block-electronics-4", amount = 2},
               {type = "item", name = "block-energy-4", amount = 3},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 5} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 5} or nil,
             }
           },
           {
@@ -72,7 +72,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-4", amount = 3},
               {type = "item", name = "block-electronics-4", amount = 3},
               {type = "item", name = "block-energy-4", amount = 4},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 7} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 7} or nil,
             }
           },
 
@@ -84,7 +84,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-5", amount = 1},
               {type = "item", name = "block-electronics-5", amount = 1},
               {type = "item", name = "block-energy-5", amount = 2},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 2} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 2} or nil,
             }
           },
           {
@@ -95,7 +95,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-5", amount = 2},
               {type = "item", name = "block-electronics-5", amount = 2},
               {type = "item", name = "block-energy-5", amount = 3},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 5} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 5} or nil,
             }
           },
           {
@@ -106,7 +106,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-5", amount = 3},
               {type = "item", name = "block-electronics-5", amount = 3},
               {type = "item", name = "block-energy-5", amount = 4},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 7} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 7} or nil,
             }
           }
         }

diff --git a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua
@@ -54,6 +54,7 @@ if angelsmods.industries.components then
   -----------------------------------------------------------------------------
   if mods["bobelectronics"] then
     OV.disable_recipe("wooden-board-paper")
+    OV.disable_recipe("superior-circuit-board")
   end
   -----------------------------------------------------------------------------
   -- BOB REVAMP ---------------------------------------------------------------