compat: AAI industries sand and maraxsis sand are now the same item.

compat/aai-industry.lua

@@ -2,24 +2,3 @@ if not mods["aai-industry"] then return end
 
 data.raw.recipe["motor"].category = "maraxsis-hydro-plant-or-assembling"
 data.raw.recipe["electric-motor"].category = "maraxsis-hydro-plant-or-assembling"
-
-data:extend {{
-    type = "recipe",
-    name = "maraxsis-aai-sand-conversion",
-    enabled = false,
-    ingredients = {
-        {type = "item", name = "maraxsis-sand", amount = 1}
-    },
-    results = {
-        {type = "item", name = "sand", amount = 2}
-    },
-    localised_name = {"item-name.sand"},
-    allow_productivity = true,
-    allow_decomposition = false,
-    auto_recycle = false,
-}}
-
-table.insert(data.raw.technology["sand-processing"].effects, {
-    type = "unlock-recipe",
-    recipe = "maraxsis-aai-sand-conversion"
-})

data-updates.lua

@@ -93,7 +93,7 @@ if mods["assembler-pipe-passthrough"] then
 end
 
 data.raw.recipe["maraxsis-glass-panes-recycling"].results = {
-    {type = "item", name = "maraxsis-sand",      amount = 1, probability = 0.75},
+    {type = "item", name = "sand",      amount = 1, probability = 0.75},
     {type = "item", name = "maraxsis-salt",      amount = 1, probability = 0.25},
     {type = "item", name = "maraxsis-limestone", amount = 1, probability = 0.25},
 }

locale/ca/locale.cfg

@@ -19,7 +19,7 @@ maraxsis-effect-transmission=Transmissió d'efectes dels mòduls
 [quality-tooltip]
 
 [item-name]
-maraxsis-sand=Arena
+sand=Arena
 
 [item-description]
 

locale/de/locale.cfg

@@ -77,7 +77,7 @@ maraxsis-polylplast=Eine Ansammlung von Millionen winziger Tiere.
 
 [item-name]
 hydraulic-science-pack=Wissenschaftspaket für Hydraulik
-maraxsis-sand=Sand
+sand=Sand
 maraxsis-salt=Salz
 maraxsis-electricity=Elektrizität
 maraxsis-glass-panes=Glasplatten
@@ -100,7 +100,7 @@ maraxsis-salted-science=Gesalzenes Wissenschaftspaket
 
 [item-description]
 hydraulic-science-pack=Wird von Laboren für Forschung benötigt.
-maraxsis-sand=Fein gemahlenes Quarzpulver, das zur Herstellung von Glas verwendet werden kann. Platziere einen Erzförderer an einer beliebigen Stelle auf [planet=maraxsis], um Sand zu gewinnen.
+sand=Fein gemahlenes Quarzpulver, das zur Herstellung von Glas verwendet werden kann. Platziere einen Erzförderer an einer beliebigen Stelle auf [planet=maraxsis], um Sand zu gewinnen.
 maraxsis-salt=Der Albtraum der Schnecken. Kann im [entity=maraxsis-salt-reactor] verbrannt werden, um Energie zu erzeugen.
 maraxsis-limestone=Ein Sedimentgestein, das aus den Skelettfragmenten von Meeresorganismen besteht.
 maraxsis-glass-panes=Ein transparentes Material, das zum Bau von Fenstern und anderen Strukturen verwendet werden kann. Hohe Druckbeständigkeit.

locale/en/locale.cfg

@@ -99,7 +99,7 @@ atmosphere-consumption=Decreases the [fluid=maraxsis-atmosphere] consumption at
 
 [item-name]
 hydraulic-science-pack=Hydraulic science pack
-maraxsis-sand=Sand
+sand=Sand
 maraxsis-salt=Salt
 maraxsis-electricity=Electricity
 maraxsis-glass-panes=Glass
@@ -123,7 +123,7 @@ maraxsis-salted-science=Salted science
 
 [item-description]
 hydraulic-science-pack=Used by labs for research.
-maraxsis-sand=Finely crushed quartz powder that can be used to make glass. Place a mining drill anywhere on [planet=maraxsis] to extract sand.
+sand=Finely crushed quartz powder that can be used to make glass. Place a mining drill anywhere on [planet=maraxsis] to extract sand.
 maraxsis-salt=Bane of snails. Can be burned in the [entity=maraxsis-salt-reactor] to generate power.
 maraxsis-limestone=A sedimentary rock composed of the skeletal fragments of marine organisms.
 maraxsis-glass-panes=A transparent material that can be used to build windows and other structures. High resistance to pressure.

locale/es-ES/locale.cfg

@@ -95,7 +95,7 @@ atmosphere-consumption=Disminuye el consumo de [fluid=maraxsis-atmosphere] a may
 
 [item-name]
 hydraulic-science-pack=Paquete de ciencia hidráulica
-maraxsis-sand=Arena
+sand=Arena
 maraxsis-salt=Sal
 maraxsis-electricity=Electricidad
 maraxsis-glass-panes=Vidrio
@@ -119,7 +119,7 @@ maraxsis-salted-science=Ciencia salada
 
 [item-description]
 hydraulic-science-pack=Usado por los laboratorios para investigar.
-maraxsis-sand=Polvo de cuarzo triturado que puede utilizarse para hacer cristal. Coloque una perforadora en cualquier lugar de [planet=maraxsis] para extraer arena.
+sand=Polvo de cuarzo triturado que puede utilizarse para hacer cristal. Coloque una perforadora en cualquier lugar de [planet=maraxsis] para extraer arena.
 maraxsis-salt=Restos de crustáceos. Se puede quemar en el [entity=maraxsis-sal-reactor] para generar energía.
 maraxsis-limestone=Una roca sedimentaria compuesta de los fragmentos esqueléticos de organismos marinos.
 maraxsis-glass-panes=Un material transparente que puede utilizarse para construir ventanas y otras estructuras. Alta resistencia a la presión.

locale/fr/locale.cfg

@@ -74,7 +74,7 @@ maraxsis-trench-duct-lower=Tuyau extrêmement long et durable qui transfère dir
 
 [item-name]
 hydraulic-science-pack=Pack de science hydraulique
-maraxsis-sand=Sable
+sand=Sable
 maraxsis-salt=Sel
 maraxsis-electricity=Électricité
 maraxsis-glass-panes=Panneaux de verre
@@ -96,7 +96,7 @@ maraxsis-fish-food=Nourriture pour poissons
 
 [item-description]
 hydraulic-science-pack=Utilisé par les laboratoires pour la recherche.
-maraxsis-sand=Poudre de quartz finement broyée pouvant être utilisée pour fabriquer du verre. Placez une foreuse n'importe où sur [planet=maraxsis] pour extraire du sable.
+sand=Poudre de quartz finement broyée pouvant être utilisée pour fabriquer du verre. Placez une foreuse n'importe où sur [planet=maraxsis] pour extraire du sable.
 maraxsis-salt=Fléau des escargots. Peut être brûlé dans le [entity=maraxsis-salt-reactor] pour générer de l'énergie.
 maraxsis-limestone=Roche sédimentaire composée des fragments squelettiques d’organismes marins.
 maraxsis-glass-panes=Matériau transparent pouvant être utilisé pour construire des fenêtres et autres structures. Haute résistance à la pression.

locale/ja/locale.cfg

@@ -20,7 +20,7 @@ spidertron-enhancements-corpse=死体
 [quality-tooltip]
 
 [item-name]
-maraxsis-sand=砂
+sand=砂
 maraxsis-electricity=電力
 maraxsis-glass-panes=ガラス
 

locale/ko/locale.cfg

@@ -20,7 +20,7 @@ spidertron-enhancements-corpse=시체
 [quality-tooltip]
 
 [item-name]
-maraxsis-sand=모래
+sand=모래
 maraxsis-electricity=전기
 maraxsis-glass-panes=유리
 

locale/pl/locale.cfg

@@ -19,7 +19,7 @@ maraxsis-effect-transmission=Transmisja efektu
 [quality-tooltip]
 
 [item-name]
-maraxsis-sand=Piasek
+sand=Piasek
 maraxsis-electricity=Elektryczność
 maraxsis-glass-panes=Szyba
 

locale/ru/locale.cfg

@@ -95,7 +95,7 @@ atmosphere-consumption=Уменьшает потребление [fluid=maraxsis
 
 [item-name]
 hydraulic-science-pack=Гидравлический исследовательский пакет
-maraxsis-sand=Песок
+sand=Песок
 maraxsis-salt=Соль
 maraxsis-electricity=Электричество
 maraxsis-glass-panes=Стекло
@@ -119,7 +119,7 @@ maraxsis-salted-science=Консервированный с/х исследов
 
 [item-description]
 hydraulic-science-pack=Используется лабораториями для исследований.
-maraxsis-sand=Мелкоизмельченный кварцевый порошок, который можно использовать для изготовления стекла.
+sand=Мелкоизмельченный кварцевый порошок, который можно использовать для изготовления стекла.
 maraxsis-salt=Бесцветное кристаллическое вещество, используемое в пищевой промышленности.
 maraxsis-limestone=Осадочная горная порода, состоящая из фрагментов скелетов океанических организмов.
 maraxsis-glass-panes=Прозрачный материал, который можно использовать для изготовления окон и других конструкций. Имеет высокую устойчивость к давлению.

locale/uk/locale.cfg

@@ -20,7 +20,7 @@ spidertron-enhancements-corpse=Труп
 [quality-tooltip]
 
 [item-name]
-maraxsis-sand=Пісок
+sand=Пісок
 maraxsis-salt=сіль
 maraxsis-electricity=Електрика
 maraxsis-glass-panes=Скло

locale/zh-CN/locale.cfg

@@ -92,7 +92,7 @@ atmosphere-consumption=在更高等级减少[fluid=maraxsis-atmosphere]消耗
 
 [item-name]
 hydraulic-science-pack=液压科技包
-maraxsis-sand=沙子
+sand=沙子
 maraxsis-salt=盐
 maraxsis-electricity=电力
 maraxsis-glass-panes=玻璃板
@@ -116,7 +116,7 @@ maraxsis-salted-science=盐质农业科学包
 
 [item-description]
 hydraulic-science-pack=用于实验室进行研究。
-maraxsis-sand=精细研磨的石英粉末，可用于制作玻璃。在[planet=maraxsis]的任意位置放置矿机可以进行采砂。
+sand=精细研磨的石英粉末，可用于制作玻璃。在[planet=maraxsis]的任意位置放置矿机可以进行采砂。
 maraxsis-salt=蜗牛的克星。可以在[entity=maraxsis-salt-reactor]中消耗来产生电力
 maraxsis-limestone=一种由海洋生物骨骼碎片组成的沉积岩。
 maraxsis-glass-panes=一种透明材料，可用于建造窗户和其他结构。高抗压性。

locale/zh-TW/locale.cfg

@@ -87,7 +87,7 @@ atmosphere-consumption=在更高等級減少[fluid=maraxsis-atmosphere]消耗
 
 [item-name]
 hydraulic-science-pack=液壓科技包
-maraxsis-sand=細沙
+sand=細沙
 maraxsis-salt=鹽
 maraxsis-electricity=電力
 maraxsis-glass-panes=強化玻璃板
@@ -111,7 +111,7 @@ maraxsis-salted-science=防腐處理農業科技包
 
 [item-description]
 hydraulic-science-pack=供實驗室研究科技用。
-maraxsis-sand=精細研磨的石英粉末，可用於製作玻璃。在[planet=maraxsis]的任意位置放置礦機可以進行採砂。
+sand=精細研磨的石英粉末，可用於製作玻璃。在[planet=maraxsis]的任意位置放置礦機可以進行採砂。
 maraxsis-salt=蝸牛的剋星。可以在[entity=maraxsis-salt-reactor]中消耗來產生電力。
 maraxsis-limestone=一種由海洋生物骨骼碎片組成的沉積岩。
 maraxsis-glass-panes=一種透明材料，可用於建造窗戶和其他結構。高抗壓性。

migrations/sand.json

@@ -0,0 +1,18 @@
+{
+    "recipe": [
+        [
+            "maraxsis-sand",
+            "maraxsis-sand-extraction"
+        ],
+        [
+            "maraxsis-sand-recycling",
+            "sand-recycling"
+        ]
+    ],
+    "item": [
+        [
+            "maraxsis-sand",
+            "sand"
+        ]
+    ]
+}

prototypes/default-import-location.lua

@@ -20,7 +20,7 @@ set_default_import_location("maraxsis-sonar", "maraxsis")
 set_default_import_location("maraxsis-pressure-dome", "maraxsis")
 set_default_import_location("maraxsis-coral", "maraxsis")
 set_default_import_location("maraxsis-limestone", "maraxsis")
-set_default_import_location("maraxsis-sand", "maraxsis")
+set_default_import_location("sand", "maraxsis")
 set_default_import_location("maraxsis-glass-panes", "maraxsis")
 set_default_import_location("maraxsis-fish-food", "maraxsis")
 set_default_import_location("maraxsis-tropical-fish", "maraxsis")

prototypes/fishing-tower.lua

@@ -14,7 +14,7 @@ data:extend {{
     energy_required = 3,
     ingredients = {
         {type = "item", name = "maraxsis-tropical-fish", amount = 1},
-        {type = "item", name = "maraxsis-sand",          amount = 1},
+        {type = "item", name = "sand",          amount = 1},
         {type = "item", name = "maraxsis-coral",         amount = 3},
         {type = "item", name = "plastic-bar",            amount = 1},
     },

prototypes/glass.lua

@@ -6,7 +6,7 @@ data:extend {{
     effects = {
         {
             type = "unlock-recipe",
-            recipe = "maraxsis-sand",
+            recipe = "maraxsis-sand-extraction",
         },
         {
             type = "unlock-recipe",
@@ -59,7 +59,7 @@ data:extend {{
     enabled = false,
     energy_required = 5,
     ingredients = {
-        {type = "item", name = "maraxsis-sand",      amount = 3},
+        {type = "item", name = "sand",      amount = 3},
         {type = "item", name = "maraxsis-limestone", amount = 1},
         {type = "item", name = "maraxsis-salt",      amount = 1},
     },
@@ -104,7 +104,7 @@ end
 
 data:extend {{
     type = "item",
-    name = "maraxsis-sand",
+    name = "sand",
     icon = "__maraxsis__/graphics/icons/sand-3.png",
     pictures = sand_variants,
     icon_size = 64,

prototypes/item-sounds.lua

@@ -27,7 +27,7 @@ add_sound_item("maraxsis-sonar", item_sounds.metal_large_inventory_move, item_so
 add_sound_item("maraxsis-pressure-dome", item_sounds.metal_large_inventory_move, item_sounds.metal_large_inventory_pickup, item_sounds.metal_large_inventory_move)
 add_sound_item("maraxsis-coral", space_age_item_sounds.agriculture_inventory_move, space_age_item_sounds.agriculture_inventory_pickup, space_age_item_sounds.agriculture_inventory_move)
 add_sound_item("maraxsis-limestone", item_sounds.resource_inventory_move, item_sounds.resource_inventory_pickup, item_sounds.resource_inventory_move)
-add_sound_item("maraxsis-sand", item_sounds.resource_inventory_move, item_sounds.resource_inventory_pickup, item_sounds.resource_inventory_move)
+add_sound_item("sand", item_sounds.resource_inventory_move, item_sounds.resource_inventory_pickup, item_sounds.resource_inventory_move)
 add_sound_item("maraxsis-glass-panes", item_sounds.metal_small_inventory_move, item_sounds.metal_small_inventory_pickup, item_sounds.metal_small_inventory_move)
 add_sound_item("maraxsis-fish-food", space_age_item_sounds.agriculture_inventory_move, space_age_item_sounds.agriculture_inventory_pickup, space_age_item_sounds.agriculture_inventory_move)
 add_sound_item("maraxsis-tropical-fish", item_sounds.raw_fish_inventory_move, item_sounds.raw_fish_inventory_pickup, item_sounds.raw_fish_inventory_move)

prototypes/item-subgroups.lua

@@ -21,7 +21,7 @@ end
 make_subgroup("maraxsis-intermediants", "ge", "intermediate-products", {
     data.raw.item["maraxsis-coral"],
     data.raw.item["maraxsis-limestone"],
-    data.raw.item["maraxsis-sand"],
+    data.raw.item["sand"],
     data.raw.item["maraxsis-glass-panes"],
     data.raw.item["maraxsis-fish-food"],
     data.raw.capsule["maraxsis-tropical-fish"],

prototypes/item-weight.lua

@@ -23,7 +23,7 @@ i_want_to_fit_this_many_per_rocket("maraxsis-sonar", 20)
 i_want_to_fit_this_many_per_rocket("maraxsis-pressure-dome", 0)
 i_want_to_fit_this_many_per_rocket("maraxsis-coral", 500)
 i_want_to_fit_this_many_per_rocket("maraxsis-limestone", 200)
-i_want_to_fit_this_many_per_rocket("maraxsis-sand", 500)
+i_want_to_fit_this_many_per_rocket("sand", 500)
 i_want_to_fit_this_many_per_rocket("maraxsis-glass-panes", 500)
 i_want_to_fit_this_many_per_rocket("maraxsis-fish-food", 100)
 i_want_to_fit_this_many_per_rocket("maraxsis-tropical-fish", 100)

prototypes/planet/maraxsis-noise-expressions.lua

@@ -276,7 +276,7 @@ data.raw["simple-entity"]["big-sand-rock-underwater"].autoplace = {
 }
 
 data.raw["simple-entity"]["big-sand-rock-underwater"].minable.results = {
-    {type = "item", name = "maraxsis-sand", amount_min = 11, amount_max = 15},
+    {type = "item", name = "sand", amount_min = 11, amount_max = 15},
     {type = "item", name = "stone",         amount_min = 11, amount_max = 15}
 }
 

prototypes/sand-extractor.lua

@@ -5,12 +5,12 @@ data:extend {{
 
 data:extend {{
     type = "recipe",
-    name = "maraxsis-sand",
+    name = "maraxsis-sand-extraction",
     category = "maraxsis-sand-extraction",
     energy_required = 10,
     ingredients = {},
     results = {
-        {type = "item", name = "maraxsis-sand", amount = 1}
+        {type = "item", name = "sand", amount = 1}
     },
     enabled = false,
     show_amount_in_title = false,
@@ -21,16 +21,19 @@ data:extend {{
         min = 200000,
         max = 200000,
     }},
-    maximum_productivity = 9999999
+    maximum_productivity = 9999999,
+    main_product = "sand",
+    localised_name = {"item-name.sand"},
+    localised_description = {"item-description.sand"},
 }}
 
-for i = 1, 10 do
+for i = 1, 50 do
     local mining_productivity = data.raw["technology"]["mining-productivity-" .. i]
     if not mining_productivity then break end
 
     table.insert(mining_productivity.effects, {
         type = "change-recipe-productivity",
-        recipe = "maraxsis-sand",
+        recipe = "maraxsis-sand-extraction",
         change = 0.1,
         hidden = true
     })
@@ -45,7 +48,7 @@ for extractor in pairs(maraxsis.MARAXSIS_SAND_EXTRACTORS) do
     extractor.localised_name = extractor.localised_name or {"entity-name." .. extractor.name}
     extractor.localised_description = extractor.localised_description or {"?", {"entity-description." .. extractor.name}, ""}
     extractor.hidden_in_factoriopedia = false
-    extractor.fixed_recipe = "maraxsis-sand"
+    extractor.fixed_recipe = "maraxsis-sand-extraction"
     extractor.fixed_quality = "normal"
     extractor.crafting_speed = extractor.mining_speed
     extractor.mining_speed = nil