From c02daf3861c3b226704fb727010b23f8030c8caa Mon Sep 17 00:00:00 2001
From: Anton Tarasenko <dkanus@gmail.com>
Date: Mon, 30 Aug 2021 13:53:08 +0700
Subject: [PATCH] Refactor Acedia's API to only support `Actor` refs

---
 sources/Types/Boxes/Native/ActorBox.uc | 105 -------------------------
 sources/Types/Refs/RefAPI.uc           |  14 ++++
 2 files changed, 14 insertions(+), 105 deletions(-)
 delete mode 100644 sources/Types/Boxes/Native/ActorBox.uc

diff --git a/sources/Types/Boxes/Native/ActorBox.uc b/sources/Types/Boxes/Native/ActorBox.uc
deleted file mode 100644
index 6d8ff6a..0000000
--- a/sources/Types/Boxes/Native/ActorBox.uc
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- *  This file either was manually edited with minimal changes from the template
- *  for value boxes.
- *      Copyright 2021 Anton Tarasenko
- *------------------------------------------------------------------------------
- * This file is part of Acedia.
- *
- * Acedia is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License, or
- * (at your option) any later version.
- *
- * Acedia is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Acedia.  If not, see <https://www.gnu.org/licenses/>.
- */
-class ActorBox extends ValueBox
-    dependson(ActorService);
-
-var protected int                           boxHashCode;
-var protected bool                          hasValue;
-var protected ActorService.ActorReference   valueRef;
-
-protected function Finalizer()
-{
-    local ActorService service;
-    if (hasValue) {
-        service = ActorService(class'ActorService'.static.Require());
-    }
-    if (service != none) {
-        service.RemoveActor(valueRef);
-    }
-    hasValue = false;
-}
-
-/**
- *  Returns stored value.
- *
- *  @return Value, stored in this reference.
- */
-public final function AcediaActor Get()
-{
-    local ActorService service;
-    if (!hasValue) {
-        return none;
-    }
-    service = ActorService(class'ActorService'.static.Require());
-    if (service != none) {
-        return AcediaActor(service.GetActor(valueRef));
-    }
-    return none;
-}
-
-/**
- *  Initialized box value. Can only be called once.
- *
- *  @param  boxValue    Value to store in this reference.
- *  @return Reference to the caller `ActorBox` to allow for method chaining.
- */
-public final function ActorBox Initialize(AcediaActor boxValue)
-{
-    local ActorService service;
-    if (IsInitialized()) {
-        return self;
-    }
-    service = ActorService(class'ActorService'.static.Require());
-    if (service == none) {
-        return self;
-    }
-    valueRef = service.AddActor(boxValue);
-    hasValue = true;
-    MarkInitialized();
-    if (boxValue != none) {
-        boxHashCode = boxValue.GetHashCode();
-    }
-    else {
-        boxHashCode = super.GetHashCode();
-    }
-    return self;
-}
-
-public function bool IsEqual(Object other)
-{
-    local ActorBox    otherBox;
-    local ActorService      service;
-    otherBox = ActorBox(other);
-    if (otherBox == none)   return false;
-    service = ActorService(class'ActorService'.static.Require());
-    if (service == none)    return false;
-
-    return Get() == otherBox.Get();
-}
-
-protected function int CalculateHashCode()
-{
-    return boxHashCode;
-}
-
-defaultproperties
-{
-}
diff --git a/sources/Types/Refs/RefAPI.uc b/sources/Types/Refs/RefAPI.uc
index e4a6542..d271940 100644
--- a/sources/Types/Refs/RefAPI.uc
+++ b/sources/Types/Refs/RefAPI.uc
@@ -180,6 +180,20 @@ public final function IntArrayRef EmptyIntArray()
     return IntArrayRef(_.memory.Allocate(class'IntArrayRef'));
 }
 
+/**
+ *  Creates reference object to store an `Actor` value.
+ *
+ *  @param  value   Initial value to store in reference.
+ *  @return `ActorRef`, containing `value`.
+ */
+public final function ActorRef Actor(optional AcediaActor value)
+{
+    local ActorRef ref;
+    ref = ActorRef(_.memory.Allocate(class'ActorRef'));
+    ref.Set(value);
+    return ref;
+}
+
 defaultproperties
 {
 }
\ No newline at end of file