Updated Extended Minerals to 2.0 and current Angels

Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua

@@ -2,7 +2,7 @@ data:extend(
 {
 	--[[{
 		type = "fluid",
-		name = "water-phosphoric-waste",
+		name = "angels-water-phosphoric-waste",
 		icon = "__Clowns-Processing__/graphics/icons/water-radioactive-waste.png",
 		icon_size = 32,
 		default_temperature = 25,
@@ -15,7 +15,7 @@ data:extend(
 	},
 	{
 		type = "fluid",
-		name = "water-uranyl-waste",
+		name = "angels-water-uranyl-waste",
 		icon = "__Clowns-Processing__/graphics/icons/water-radioactive-waste.png",
 		icon_size = 32,
 		default_temperature = 25,
@@ -28,7 +28,7 @@ data:extend(
 	},
 	{
 		type = "fluid",
-		name = "water-thoric-waste",
+		name = "angels-water-thoric-waste",
 		icon = "__Clowns-Processing__/graphics/icons/water-radioactive-waste.png",
 		icon_size = 32,
 		default_temperature = 25,
@@ -41,7 +41,7 @@ data:extend(
 	},]]
 	{
 		type = "fluid",
-		name = "water-radioactive-waste",
+		name = "angels-water-radioactive-waste",
 		icon = "__Clowns-AngelBob-Nuclear__/graphics/icons/water-radioactive-waste.png",
 		icon_size = 32,
 		default_temperature = 25,

Clowns-AngelBob-Nuclear/prototypes/overrides.lua

@@ -14,7 +14,7 @@ else
 	angelsmods.functions.OV.add_unlock("nuclear-fuel-reprocessing-2","advanced-nuclear-fuel-reprocessing-2")
   angelsmods.functions.OV.add_unlock("nuclear-fuel-reprocessing-2","advanced-nuclear-fuel-reprocessing-b")
 end
-angelsmods.functions.make_void("water-radioactive-waste", "water")
+angelsmods.functions.make_void("angels-water-radioactive-waste", "water")
 if mods["angelsindustries"] then
   --update nuclear cells
   clowns.functions.replace_ing("angels-advanced-mixed-oxide-reprocessing","uranium-235","35pc-uranium","res")

Clowns-AngelBob-Nuclear/prototypes/recipes/clowns-centrifuging.lua

@@ -8,7 +8,7 @@ data:extend(
 		energy_required = energy,
 		enabled = false,
 		category = "centrifuging",
-		ingredients = {{"solid-uranium-hexafluoride", 48}},--decent saving yo
+		ingredients = {{"angels-solid-uranium-hexafluoride", 48}},--decent saving yo
 		icons =
 		{
 			{

Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua

@@ -8,7 +8,7 @@ data:extend(
 		category = "chemistry",
 		ingredients =
 		{
-			{type="item", name="depleted-uranium-fuel-cell", amount=5},
+			{type="item", name="used-up-uranium-fuel-cell", amount=5},
 			{type="fluid", name="angels-liquid-nitric-acid", amount=300}--20
 		},
 		icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png", icon_size = 32,}},
@@ -21,7 +21,7 @@ data:extend(
 			{type="item", name="plutonium-239", amount=2},
 			{type="item", name="strontium-90", amount=1},--1
 			{type="item", name="caesium-137", amount=3},--1
-			{type="fluid", name="water-radioactive-waste", amount=300}--100 (matching the waste liq)
+			{type="fluid", name="angels-water-radioactive-waste", amount=300}--100 (matching the waste liq)
 		},
 	},
 	{
@@ -32,7 +32,7 @@ data:extend(
 		category = "chemistry",
 		ingredients =
 		{
-			{type="item", name="depleted-uranium-fuel-cell", amount=5},
+			{type="item", name="used-up-uranium-fuel-cell", amount=5},
 			{type="fluid", name="angels-liquid-nitric-acid", amount=350}--20
 		},
 		icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png", icon_size = 32,}},
@@ -45,7 +45,7 @@ data:extend(
 			{type="item", name="plutonium-239", amount=2},
 			{type="item", name="strontium-90", amount=1},--1
 			{type="item", name="caesium-137", amount=5},--1
-			{type="fluid", name="water-radioactive-waste", amount=350}--100 (matching the waste liq)
+			{type="fluid", name="angels-water-radioactive-waste", amount=350}--100 (matching the waste liq)
 		},
 	},
 	{
@@ -56,7 +56,7 @@ data:extend(
 		category = "chemistry",
 		ingredients =
 		{
-			{type="item", name="depleted-uranium-fuel-cell", amount=5},
+			{type="item", name="used-up-uranium-fuel-cell", amount=5},
 			{type="fluid", name="angels-liquid-nitric-acid", amount=300}--20
 		},
 		icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png",icon_size=32}},
@@ -68,7 +68,7 @@ data:extend(
 			{type="item", name="uranium-238", amount=1}, --slight nerf because of lack of thorium
 			{type="item", name="plutonium-239", amount=1}, --slight nerf because of lack of thorium
 			{type="item", name="protactinium-231", amount=4},--1--3 --slight nerf because of lack of thorium
-			{type="fluid", name="water-radioactive-waste", amount=300}--100 (matching the waste liq)
+			{type="fluid", name="angels-water-radioactive-waste", amount=300}--100 (matching the waste liq)
 		},
 	},
 })
@@ -122,7 +122,7 @@ data:extend(
 			{type="item", name="thorium-232", amount=3},--3 (needs to be less than 19/10)
 			{type="item", name="plutonium-239", amount=3},--1
 			{type="item", name="protactinium-231", amount=15},--1--3
-			{type="fluid", name="water-radioactive-waste", amount=300}--20--60
+			{type="fluid", name="angels-water-radioactive-waste", amount=300}--20--60
 		},
 	},
 	{
@@ -145,7 +145,7 @@ data:extend(
 			{type="item", name="thorium-232", amount=1},
 			{type="item", name="plutonium-239", amount=6},--8
 			{type="item", name="strontium-90", amount=9},
-			{type="fluid", name="water-radioactive-waste", amount=150}
+			{type="fluid", name="angels-water-radioactive-waste", amount=150}
 		},
 	},
 }

Clowns-AngelBob-Nuclear/prototypes/recipes/thorium.lua

@@ -65,17 +65,17 @@ if data.raw.item["thorium-fuel-cell"] then
     {
       type = "recipe",
       name = "thorium-ore-processing",
-      category = "ore-refining-t3-5",
+      category = "angels-ore-refining-t3-5",
       energy_required = 30,
       enabled = false,
       ingredients = {
         {"thorium-ore",10},
-        {type="fluid",name="liquid-hydrofluoric-acid",amount=100}
+        {type="fluid",name="angels-liquid-hydrofluoric-acid",amount=100}
       },
       results = {
         {type="fluid",name="thorium-solution",amount=13},
         {type="fluid",name="steam", amount=90, temperature=650},
-        {"slag",2}
+        {"angels-slag",2}
       },
       main_product = "thorium-solution",
     },
@@ -87,11 +87,11 @@ if data.raw.item["thorium-fuel-cell"] then
       enabled = false,
       ingredients = {
         {type="fluid",name="thorium-solution",amount=26},
-        {type="fluid",name="water-purified",amount=180}
+        {type="fluid",name="angels-water-purified",amount=180}
       },
       results = {
         {"thorium-salt",20},
-        {type="fluid",name="water-greenyellow-waste", amount=200},
+        {type="fluid",name="angels-water-greenyellow-waste", amount=200},
       },
       main_product="thorium-salt",
     },
@@ -103,12 +103,12 @@ if data.raw.item["thorium-fuel-cell"] then
       enabled = false,
       ingredients = {
         {"thorium-salt",13},
-        {type="fluid",name="liquid-naphtha",amount=200}
+        {type="fluid",name="angels-liquid-naphtha",amount=200}
       },
       results = {
         {"thorium-232",9},
-        {type="fluid",name="liquid-naphtha",amount=200},
-        {"slag",4}
+        {type="fluid",name="angels-liquid-naphtha",amount=200},
+        {"angels-slag",4}
       },
       main_product = "thorium-232",
     }

Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua

@@ -9,7 +9,7 @@ data:extend(
 		enabled = false,
 		ingredients =
 		{
-			{type="fluid", name="water-radioactive-waste", amount=100}
+			{type="fluid", name="angels-water-radioactive-waste", amount=100}
 		},
 		results=
 		{

Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua

@@ -3,10 +3,10 @@ local OV = angelsmods.functions.OV
 --REPLACE URANIUM HEXAFLUORIDE CENTRIFUGING RECIPE
 data.raw.technology["advanced-uranium-processing-1"].effects =
 {
-	{type = "unlock-recipe", recipe = "solid-uranium-hexafluoride"},
-	{type = "unlock-recipe", recipe = "solid-uranium-tetrafluoride"},
-	{type = "unlock-recipe", recipe = "solid-uranium-oxide-1"},
-	{type = "unlock-recipe", recipe = "clowns-centrifuging-20pc-hexafluoride"},
+	{type = "unlock-recipe", recipe = "angels-solid-uranium-hexafluoride"},
+	{type = "unlock-recipe", recipe = "angels-solid-uranium-tetrafluoride"},
+	{type = "unlock-recipe", recipe = "angels-solid-uranium-oxide-1"},
+	{type = "unlock-recipe", recipe = "clowns-centrifuging-20%-hexafluoride"},
 }
 --clobber vanilla and angels nuclear fuel recipes
 if data.raw.technology["angels-nuclear-fuel"] then

Clowns-Extended-Minerals/data-updates.lua

@@ -14,8 +14,7 @@ for i=1,15 do --allow for many options, particularly for the second step (minimu
     end
   end
 end
-angelsmods.trigger.ores["platinum"] = true
-angelsmods.functions.remove_flag("platinum-ore","hidden")
+angelsmods.functions.remove_flag("angels-platinum-ore","hidden")
 --ADD RESOURCE PROCESSING RECIPES TO THE APPROPRIATE TECHNOLOGIES
 
 table.insert(data.raw["technology"]["angels-oil-gas-extraction"].effects, {type = "unlock-recipe", recipe = "clowns-resource2-liquification"})

Clowns-Extended-Minerals/data.lua

@@ -39,27 +39,27 @@ require("prototypes.omnicrystals.omnicrystal_functions")
 local ore1fluid,ore2fluid,ore3fluid,ore4fluid,ore5fluid,ore6fluid,ore7fluid,ore8fluid,ore9fluid
 
 if mods["angelspetrochem"] and settings.startup["angels-enable-acids"].value then
-	ore1fluid = "liquid-hydrofluoric-acid"
-	ore2fluid = "liquid-sulfuric-acid"
-	ore3fluid = "liquid-nitric-acid"
-	ore4fluid = "liquid-hydrochloric-acid"
-	ore5fluid = "liquid-nitric-acid"
-	ore6fluid = "liquid-sulfuric-acid"
-  ore7fluid = "liquid-hydrofluoric-acid"
-  ore8fluid = "liquid-hydrochloric-acid"
-  ore9fluid = "liquid-phosphoric-acid"
+	ore1fluid = "angels-liquid-hydrofluoric-acid"
+	ore2fluid = "angels-liquid-sulfuric-acid"
+	ore3fluid = "angels-liquid-nitric-acid"
+	ore4fluid = "angels-liquid-hydrochloric-acid"
+	ore5fluid = "angels-liquid-nitric-acid"
+	ore6fluid = "angels-liquid-sulfuric-acid"
+  ore7fluid = "angels-liquid-hydrofluoric-acid"
+  ore8fluid = "angels-liquid-hydrochloric-acid"
+  ore9fluid = "angels-liquid-phosphoric-acid"
 else
-	ore1fluid = "liquid-sulfuric-acid"
-	ore2fluid = "liquid-sulfuric-acid"
-	ore3fluid = "liquid-sulfuric-acid"
-	ore4fluid = "liquid-sulfuric-acid"
-	ore5fluid = "liquid-sulfuric-acid"
-	ore6fluid = "liquid-sulfuric-acid"
-  ore7fluid = "liquid-sulfuric-acid"
-  ore8fluid = "liquid-sulfuric-acid"
-  ore9fluid = "liquid-sulfuric-acid"
+	ore1fluid = "angels-liquid-sulfuric-acid"
+	ore2fluid = "angels-liquid-sulfuric-acid"
+	ore3fluid = "angels-liquid-sulfuric-acid"
+	ore4fluid = "angels-liquid-sulfuric-acid"
+	ore5fluid = "angels-liquid-sulfuric-acid"
+	ore6fluid = "angels-liquid-sulfuric-acid"
+  ore7fluid = "angels-liquid-sulfuric-acid"
+  ore8fluid = "angels-liquid-sulfuric-acid"
+  ore9fluid = "angels-liquid-sulfuric-acid"
 end
-res1fluid = "liquid-phosphoric-acid"
+res1fluid = "angels-liquid-phosphoric-acid"
 res2fluid = "steam"
 
 if mods["omnimatter"] then

Clowns-Extended-Minerals/migrations/Clowns-Extended-Minerals_1.1.18.json

@@ -13,18 +13,18 @@
     ["phosphorus-ore-crystalization", "phosphorus-ore-crystal"],
     ["phosphorus-ore-omnitraction", "phosphorus-ore-crystal-omnitraction"],
     ["phosphorus-ore-solvation", "phosphorus-ore-omnide-solution"],
-    ["platinum-ore-crystalization", "platinum-ore-crystal"],
-    ["platinum-ore-omnitraction", "platinum-ore-crystal-omnitraction"],
-    ["platinum-ore-solvation", "platinum-ore-omnide-solution"],
-    ["solid-calcium-sulfate-crystalization", "solid-calcium-sulfate-crystal"],
-    ["solid-calcium-sulfate-omnitraction", "solid-calcium-sulfate-crystal-omnitraction"],
-    ["solid-calcium-sulfate-solvation", "solid-calcium-sulfate-omnide-solution"],
-    ["solid-limestone-crystalization", "solid-limestone-crystal"],
-    ["solid-limestone-omnitraction", "solid-limestone-crystal-omnitraction"],
-    ["solid-limestone-solvation", "solid-limestone-omnide-solution"],
-    ["solid-sodium-carbonate-crystalization", "solid-sodium-carbonate-crystal"],
-    ["solid-sodium-carbonate-omnitraction", "solid-sodium-carbonate-crystal-omnitraction"],
-    ["solid-sodium-carbonate-solvation", "solid-sodium-carbonate-omnide-solution"],
+    ["angels-platinum-ore-crystalization", "angels-platinum-ore-crystal"],
+    ["angels-platinum-ore-omnitraction", "angels-platinum-ore-crystal-omnitraction"],
+    ["angels-platinum-ore-solvation", "angels-platinum-ore-omnide-solution"],
+    ["angels-solid-calcium-sulfate-crystalization", "angels-solid-calcium-sulfate-crystal"],
+    ["angels-solid-calcium-sulfate-omnitraction", "angels-solid-calcium-sulfate-crystal-omnitraction"],
+    ["angels-solid-calcium-sulfate-solvation", "angels-solid-calcium-sulfate-omnide-solution"],
+    ["angels-solid-limestone-crystalization", "angels-solid-limestone-crystal"],
+    ["angels-solid-limestone-omnitraction", "angels-solid-limestone-crystal-omnitraction"],
+    ["angels-solid-limestone-solvation", "angels-solid-limestone-omnide-solution"],
+    ["angels-solid-sodium-carbonate-crystalization", "angels-solid-sodium-carbonate-crystal"],
+    ["angels-solid-sodium-carbonate-omnitraction", "angels-solid-sodium-carbonate-crystal-omnitraction"],
+    ["angels-solid-sodium-carbonate-solvation", "angels-solid-sodium-carbonate-omnide-solution"],
     ["thorium-ore-crystalization", "thorium-ore-crystal"],
     ["thorium-ore-omnitraction", "thorium-ore-crystal-omnitraction"],
     ["thorium-ore-solvation", "thorium-ore-omnide-solution"],

Clowns-Extended-Minerals/prototypes/buildings/shaft-mine.lua

@@ -57,7 +57,7 @@ data:extend(
 			animation_speed = 0.8,
 			shift = {1,-0.5}
 		},
-		crafting_categories = {"shaft-mining", "ore-sorting"},
+		crafting_categories = {"shaft-mining", "angels-ore-sorting"},
 		crafting_speed = 1, --* settings.startup["shaft-mine-crafting-speed"].value,
 		module_specification =
 		{

Clowns-Extended-Minerals/prototypes/categories.lua

@@ -61,7 +61,7 @@ data:extend(
   },
   {
 		type = "item-subgroup",
-		name = "ore-sorting-advanced-2",
+		name = "angels-ore-sorting-advanced-2",
 		group = "angels-resource-refining",
 		order = "j-e",
 	},

Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua

@@ -1,5 +1,5 @@
 local temp_triggers = {}
-local trigger_tab = {"phosphorus","osmium","magnesium","limestone","sand","calcium-sulfate","sodium-carbonate","uranium","fluorite","platinum"} 
+local trigger_tab = {"phosphorus","osmium","magnesium","limestone","sand","calcium-sulfate","angels-sodium-carbonate","uranium","fluorite","platinum"} 
 if not special_vanilla then 
   table.insert(trigger_tab,"angels-solid-lithium")
 end

Clowns-Extended-Minerals/prototypes/generation/clowns-ore-set.lua

@@ -103,7 +103,7 @@ if mods["angelsinfiniteores"] then
         minimum = angelsmods.ores.yield,
         normal = 1500,
         maximum = 6000,
-        acid_to_mine = "liquid-sulfuric-acid",
+        acid_to_mine = "angels-liquid-sulfuric-acid",
         output_name = base_ore,
         output_min = 1,
         output_max = 1,

Clowns-Extended-Minerals/prototypes/generation/clowns-resource-set.lua

@@ -12,7 +12,7 @@ local ap_dat={
 	["infinite-clowns-resource1"] = { starting_area = false, base_density = 10, regular_rq_factor_multiplier = 0.9, starting_rq_factor_multiplier = 1.1},
 }
 local resource_dat = {
-  ["clowns-resource1"] = {--[[stage="clowns-resource1",]]ore_sheet = "__Clowns-Extended-Minerals__/graphics/entity/alluvium",	order = "c-k",	mining_time = 1*0.2,	tint = {r = 0.9, g = 0.7, b = 0.7}, frame_c = 4, var_c= 8, acid = "liquid-phosphoric-acid"},
+  ["clowns-resource1"] = {--[[stage="clowns-resource1",]]ore_sheet = "__Clowns-Extended-Minerals__/graphics/entity/alluvium",	order = "c-k",	mining_time = 1*0.2,	tint = {r = 0.9, g = 0.7, b = 0.7}, frame_c = 4, var_c= 8, acid = "angels-liquid-phosphoric-acid"},
   ["clowns-resource2"] = {--[[stage="clowns-resource2",]]ore_sheet = "__Clowns-Extended-Minerals__/graphics/entity/oil-sands",	order = "c-l",	mining_time = 1*0.5,	tint = {r = 0.2, g = 0.25, b = 0.25}, frame_c = 4, var_c = 8, acid = "steam"},
 }
 ---------------------------------------------

Clowns-Extended-Minerals/prototypes/items/resource-processing.lua

@@ -20,7 +20,7 @@ data:extend(
 	},
 	--[[{--zombrine??
 		type = "fluid",
-		name = "liquid-clowns-resource4",
+		name = "angels-liquid-clowns-resource4",
 		icon = "__Clowns-Processing__/graphics/icons/liquid-clowns-resource4.png",
 		icon_size = 32,
 		default_temperature = 25,