resolved conflicts

1 files changed, 20 insertions, 0 deletions

diff --git a/src/fields/ObjectField.ts b/src/fields/ObjectField.ts
new file mode 100644
index 000000000..9aa1c9b04
--- /dev/null
+++ b/src/fields/ObjectField.ts
@@ -0,0 +1,20 @@
+import { RefField } from "./RefField";
+import { OnUpdate, Parent, Copy, ToScriptString, ToString } from "./FieldSymbols";
+import { Scripting } from "../client/util/Scripting";
+
+export abstract class ObjectField {
+    protected [OnUpdate](diff?: any) { }
+    private [Parent]?: RefField | ObjectField;
+    abstract [Copy](): ObjectField;
+
+    abstract [ToScriptString](): string;
+    abstract [ToString](): string;
+}
+
+export namespace ObjectField {
+    export function MakeCopy<T extends ObjectField>(field: T) {
+        return field?.[Copy]();
+    }
+}
+
+Scripting.addGlobal(ObjectField);
\ No newline at end of file