From ef919b256d5c07c029c39992515067b63c73f154 Mon Sep 17 00:00:00 2001 From: Cubxity Date: Tue, 13 Nov 2018 07:40:46 +0100 Subject: [PATCH 1/2] resource manager --- src/main/kotlin/cc/hyperium/Hyperium.kt | 2 ++ src/main/kotlin/cc/hyperium/utils/ResourceManager.kt | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 src/main/kotlin/cc/hyperium/utils/ResourceManager.kt diff --git a/src/main/kotlin/cc/hyperium/Hyperium.kt b/src/main/kotlin/cc/hyperium/Hyperium.kt index 7034cb4..b2eb5b1 100644 --- a/src/main/kotlin/cc/hyperium/Hyperium.kt +++ b/src/main/kotlin/cc/hyperium/Hyperium.kt @@ -3,6 +3,7 @@ package cc.hyperium import cc.hyperium.network.NetworkManager import cc.hyperium.processes.services.AbstractService import cc.hyperium.processes.services.ServiceRegistry +import cc.hyperium.utils.ResourceManager import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking @@ -35,6 +36,7 @@ object Hyperium { ) private val logger: Logger = LogManager.getLogger() private val runningServices = ServiceRegistry() + private val resourceManager = ResourceManager() private val config = ConfigFactory.createFileConfig("config-test.json", "json") private lateinit var network: NetworkManager diff --git a/src/main/kotlin/cc/hyperium/utils/ResourceManager.kt b/src/main/kotlin/cc/hyperium/utils/ResourceManager.kt new file mode 100644 index 0000000..412ddcb --- /dev/null +++ b/src/main/kotlin/cc/hyperium/utils/ResourceManager.kt @@ -0,0 +1,9 @@ +package cc.hyperium.utils + +import net.minecraft.util.ResourceLocation + +class ResourceManager : HashMap() { + fun get(k: String, def: ResourceLocation?) : ResourceLocation { + return computeIfAbsent(k){ def!! } + } +} \ No newline at end of file From 12b9bc29bf878778786a7caa2688cca4e9712de2 Mon Sep 17 00:00:00 2001 From: FalseHonesty Date: Sat, 24 Nov 2018 09:08:01 -0500 Subject: [PATCH 2/2] Refactored --- src/main/kotlin/cc/hyperium/utils/ResourceManager.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/cc/hyperium/utils/ResourceManager.kt b/src/main/kotlin/cc/hyperium/utils/ResourceManager.kt index 412ddcb..7ef2602 100644 --- a/src/main/kotlin/cc/hyperium/utils/ResourceManager.kt +++ b/src/main/kotlin/cc/hyperium/utils/ResourceManager.kt @@ -1,9 +1,9 @@ package cc.hyperium.utils +import cc.hyperium.processes.services.AbstractService +import cc.hyperium.processes.services.Service import net.minecraft.util.ResourceLocation +import org.kodein.di.Kodein -class ResourceManager : HashMap() { - fun get(k: String, def: ResourceLocation?) : ResourceLocation { - return computeIfAbsent(k){ def!! } - } -} \ No newline at end of file +@Service +class ResourceManager(override val kodein: Kodein) : AbstractService(), MutableMap by HashMap()