From 05cbffbc3f099ae8be0eeefb48aedc6be38b85ce Mon Sep 17 00:00:00 2001
From: nixnoxus <87639406+nixnoxus@users.noreply.github.com>
Date: Fri, 6 Aug 2021 19:42:24 +0200
Subject: [PATCH] Add alloying recipes for cheaper digiline cables (#198)

* cheaper recipes for lv,mv,hv digiline cable and plate

* Revert "cheaper recipes for lv,mv,hv digiline cable and plate"

This reverts commit d1ee15fc3afbf567c2050656e0799d07c9aef661.

* add config option to replace "technic:" recipes

* trailing whitespace removed

* Revert "trailing whitespace removed"

This reverts commit cc0f321cbb40b890e5f60443d7c676ba3d8036e9.

* Revert "add config option to replace "technic:" recipes"

This reverts commit 33c272f38ed2f7bd8d53b3b0d21034b973b586da.

* add alternative alloy recipes for lv,mv,hv digiline cable und plate

* longer alloying time for digi cables (3x)

* digi cable crafting recipes removed

* fix lint: line is too long (122 > 120)

Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com>
---
 technic/machines/HV/cables.lua              | 30 ---------------------
 technic/machines/LV/cables.lua              | 30 ---------------------
 technic/machines/MV/cables.lua              | 30 ---------------------
 technic/machines/register/alloy_recipes.lua | 23 +++++++++++++---
 4 files changed, 19 insertions(+), 94 deletions(-)

diff --git a/technic/machines/HV/cables.lua b/technic/machines/HV/cables.lua
index 18b2614..97e1cd4 100644
--- a/technic/machines/HV/cables.lua
+++ b/technic/machines/HV/cables.lua
@@ -13,36 +13,6 @@ if minetest.get_modpath("digilines") then
 
 	local S = technic.getter
 
-	if minetest.get_modpath("digistuff") then
-		minetest.register_craft({
-			output = 'technic:hv_digi_cable 1',
-			type = "shapeless",
-			recipe = {'digistuff:digimese', 'technic:hv_cable'}
-		})
-		minetest.register_craft({
-			output = 'technic:hv_digi_cable_plate_1 1',
-			type = "shapeless",
-			recipe = {'digistuff:digimese', 'technic:hv_cable_plate_1'}
-		})
-	else
-		minetest.register_craft({
-			output = 'technic:hv_digi_cable 1',
-			recipe = {
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'technic:hv_cable',            'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-			}
-		})
-		minetest.register_craft({
-			output = 'technic:hv_digi_cable_plate_1 1',
-			recipe = {
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'technic:hv_cable_plate_1',    'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-			}
-		})
-	end
-
 	technic.register_cable("HV", 3/16, S("HV Cable (digiline)"), "_digi", {
 		digiline = {
 			wire = {
diff --git a/technic/machines/LV/cables.lua b/technic/machines/LV/cables.lua
index be40661..f2c60df 100644
--- a/technic/machines/LV/cables.lua
+++ b/technic/machines/LV/cables.lua
@@ -16,36 +16,6 @@ if minetest.get_modpath("digilines") then
 
 	local S = technic.getter
 
-	if minetest.get_modpath("digistuff") then
-		minetest.register_craft({
-			output = 'technic:lv_digi_cable 1',
-			type = "shapeless",
-			recipe = {'digistuff:digimese', 'technic:lv_cable'}
-		})
-		minetest.register_craft({
-			output = 'technic:lv_digi_cable_plate_1 1',
-			type = "shapeless",
-			recipe = {'digistuff:digimese', 'technic:lv_cable_plate_1'}
-		})
-	else
-		minetest.register_craft({
-			output = 'technic:lv_digi_cable 1',
-			recipe = {
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'technic:lv_cable',            'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-			}
-		})
-		minetest.register_craft({
-			output = 'technic:lv_digi_cable_plate_1 1',
-			recipe = {
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'technic:lv_cable_plate_1',    'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-			}
-		})
-	end
-
 	technic.register_cable("LV", 2/16, S("LV Cable (digiline)"), "_digi", {
 		digiline = {
 			wire = {
diff --git a/technic/machines/MV/cables.lua b/technic/machines/MV/cables.lua
index 3d06d34..c5540dc 100644
--- a/technic/machines/MV/cables.lua
+++ b/technic/machines/MV/cables.lua
@@ -16,36 +16,6 @@ if minetest.get_modpath("digilines") then
 
 	local S = technic.getter
 
-	if minetest.get_modpath("digistuff") then
-		minetest.register_craft({
-			output = 'technic:mv_digi_cable 1',
-			type = "shapeless",
-			recipe = {'digistuff:digimese', 'technic:mv_cable'}
-		})
-		minetest.register_craft({
-			output = 'technic:mv_digi_cable_plate_1 1',
-			type = "shapeless",
-			recipe = {'digistuff:digimese', 'technic:mv_cable_plate_1'}
-		})
-	else
-		minetest.register_craft({
-			output = 'technic:mv_digi_cable 1',
-			recipe = {
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'technic:mv_cable',            'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-			}
-		})
-		minetest.register_craft({
-			output = 'technic:mv_digi_cable_plate_1 1',
-			recipe = {
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'technic:mv_cable_plate_1',    'digilines:wire_std_00000000'},
-				{'digilines:wire_std_00000000', 'digilines:wire_std_00000000', 'digilines:wire_std_00000000'},
-			}
-		})
-	end
-
 	technic.register_cable("MV", 2.5/16, S("MV Cable (digiline)"), "_digi", {
 		digiline = {
 			wire = {
diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua
index 0165ad9..b675e5e 100644
--- a/technic/machines/register/alloy_recipes.lua
+++ b/technic/machines/register/alloy_recipes.lua
@@ -29,14 +29,29 @@ local recipes = {
 	-- "[Compounding a] pure gum vulcanizate … with 50% of its weight of carbon black
 	-- improves its tensile strength and wear resistance …"
 	{"technic:raw_latex 4",           "technic:coal_dust 2",        "technic:rubber 6", 2},
-	{"default:ice", 		  	      "bucket:bucket_empty",        "bucket:bucket_water", 1 },
-	{"default:obsidian",			  "bucket:bucket_empty",        "bucket:bucket_lava", 1 },
+	{"default:ice",                   "bucket:bucket_empty",        "bucket:bucket_water", 1 },
+	{"default:obsidian",              "bucket:bucket_empty",        "bucket:bucket_lava", 1 },
 }
 
 if minetest.get_modpath("ethereal") then
-	table.insert(recipes, {"default:clay", "dye:red", "bakedclay:red"})
+	table.insert(recipes, {"default:clay", "dye:red",    "bakedclay:red"})
 	table.insert(recipes, {"default:clay", "dye:orange", "bakedclay:orange"})
-	table.insert(recipes, {"default:clay", "dye:grey", "bakedclay:grey"})
+	table.insert(recipes, {"default:clay", "dye:grey",   "bakedclay:grey"})
+end
+
+if minetest.get_modpath("digilines") then
+	table.insert(recipes,
+		{"technic:lv_cable",         "digilines:wire_std_00000000 2", "technic:lv_digi_cable", 18})
+	table.insert(recipes,
+		{"technic:lv_cable_plate_1", "digilines:wire_std_00000000 2", "technic:lv_digi_cable_plate_1", 18})
+	table.insert(recipes,
+		{"technic:mv_cable",         "digilines:wire_std_00000000 2", "technic:mv_digi_cable", 18})
+	table.insert(recipes,
+		{"technic:mv_cable_plate_1", "digilines:wire_std_00000000 2", "technic:mv_digi_cable_plate_1", 18})
+	table.insert(recipes,
+		{"technic:hv_cable",         "digilines:wire_std_00000000 2", "technic:hv_digi_cable", 18})
+	table.insert(recipes,
+		{"technic:hv_cable_plate_1", "digilines:wire_std_00000000 2", "technic:hv_digi_cable_plate_1", 18})
 end
 
 for _, data in pairs(recipes) do