refactor(vm, frontend): internally tag template enum, finish remap fr…

…ontend

Cargo.toml

@@ -18,7 +18,3 @@ opt-level = "s"
 lto = true
 [profile.dev]
 opt-level = 1
-
-
-[patch.crates-io]
-onig_sys = { git = "https://github.com/rust-onig/rust-onig", revision = "fa90c0e97e90a056af89f183b23cd417b59ee6a2" }

ic10emu/src/errors.rs

@@ -7,6 +7,7 @@ use crate::vm::{
     },
 };
 use serde_derive::{Deserialize, Serialize};
+use stationeers_data::templates::ObjectTemplate;
 use std::error::Error as StdError;
 use std::fmt::Display;
 use thiserror::Error;
@@ -77,8 +78,8 @@ pub enum TemplateError {
     NoTemplateForPrefab(Prefab),
     #[error("no prefab provided")]
     MissingPrefab,
-    #[error("incorrect template for concreet impl {0} from prefab {1}")]
-    IncorrectTemplate(String, Prefab),
+    #[error("incorrect template for concrete impl {0} from prefab {1}: {2:?}")]
+    IncorrectTemplate(String, Prefab, ObjectTemplate),
     #[error("frozen memory size error: {0} is not {1}")]
     MemorySize(usize, usize)
 

ic10emu/src/interpreter.rs

@@ -46,7 +46,7 @@ pub struct ICInfo {
     pub defines: BTreeMap<String, f64>,
     pub labels: BTreeMap<String, u32>,
     pub state: ICState,
-    pub yield_instruciton_count: u16,
+    pub yield_instruction_count: u16,
 }
 
 impl Display for ICState {

ic10emu/src/vm/object/stationpedia.rs

@@ -45,6 +45,7 @@ pub fn object_from_frozen(
                 return Err(TemplateError::IncorrectTemplate(
                     "ItemIntegratedCircuit10".to_string(),
                     Prefab::Name("ItemIntegratedCircuit10".to_string()),
+                    template,
                 ));
             };
 
@@ -101,7 +102,7 @@ pub fn object_from_frozen(
                 ic: obj
                     .circuit
                     .as_ref()
-                    .map(|circuit| circuit.yield_instruciton_count)
+                    .map(|circuit| circuit.yield_instruction_count)
                     .unwrap_or(0),
                 aliases: obj
                     .circuit