Skip to content

Commit df412d7

Browse files
committed
Fixed a few issues and removed some debugging
1 parent f7241c7 commit df412d7

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

Patches/MaterialDatabasePatch.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ private static void Postfix(PartDatabaseAsset __instance)
2121
foreach (KeyValuePair<ulong, PartMaterialAsset> mat in new_materials)
2222
{
2323
MaterialEntry mat_entry = new MaterialEntry(mat.Value);
24-
Plugin.Log.LogWarning("BEFORE"+__instance.materials.Count);
2524
__instance.materials.TryAdd(mat.Key, mat_entry);
26-
Plugin.Log.LogWarning("AFTER"+__instance.materials.Count);
2725
}
2826
}
2927

Patches/PartDatabasePatch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private static void Postfix(PartDatabaseAsset __instance)
3737
PartEntry new_entry = new PartEntry(part.Value);
3838
part.Value.transform.SetParent(null, false);
3939
DontDestroyOnLoad(part.Value);
40-
// GameObject.Destroy(part.Value.GetComponentInChildren<BoxCollider>());
40+
Destroy(part.Value.GetComponentInChildren<BoxCollider>());
4141
__instance.parts.TryAdd(part.Key, new_entry);
4242
}
4343
}

Utils/GearthonLoader.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ public static void LoadMaterials()
4343
{
4444
string mod_folder = pair.Key;
4545
JObject mod = pair.Value;
46+
if (mod["materials"] == null)
47+
continue;
48+
4649
JArray materials = mod["materials"].Cast<JArray>();
4750

4851
for (int i = 0; i < materials.Count; i++)
@@ -52,7 +55,6 @@ public static void LoadMaterials()
5255
string name = (string)material_data["name"];
5356
string display_name = (string)material_data["display_name"];
5457
float density = (float)material_data["density"];
55-
Plugin.Log.LogWarning("ASDIQWJDIWQO"+(material_data["strength"] ?? 0f));
5658
float strength = (dynamic)material_data["strength"] ?? 0f;
5759
bool is_paintable = (bool)material_data["is_paintable"];
5860
string file_type = (string)material_data["file_type"];
@@ -81,6 +83,10 @@ public static void LoadLinkTypes()
8183
{
8284
string mod_folder = pair.Key;
8385
JObject mod = pair.Value;
86+
87+
if (mod["link_types"] == null)
88+
continue;
89+
8490
JArray link_types = mod["link_types"].Cast<JArray>();
8591

8692
for (int i = 0; i < link_types.Count; i++)
@@ -102,6 +108,9 @@ public static void LoadParts()
102108
{
103109
string mod_folder = pair.Key;
104110
JObject mod = pair.Value;
111+
if (mod["parts"] == null)
112+
continue;
113+
105114
JArray parts = mod["parts"].Cast<JArray>();
106115

107116
for (int i = 0; i < parts.Count; i++)

0 commit comments

Comments
 (0)