diff --git a/cache-550/build.gradle.kts b/cache-550/build.gradle.kts index 52b6ba25..48f4234d 100644 --- a/cache-550/build.gradle.kts +++ b/cache-550/build.gradle.kts @@ -5,6 +5,7 @@ plugins { dependencies { api(projects.cache) + api(libs.guice) implementation(projects.buffer) implementation(projects.util) diff --git a/cache-550/src/main/kotlin/org/openrs2/cache/config/enum/EnumTypeList.kt b/cache-550/src/main/kotlin/org/openrs2/cache/config/enum/EnumTypeList.kt index 446bc4fe..3aadab01 100644 --- a/cache-550/src/main/kotlin/org/openrs2/cache/config/enum/EnumTypeList.kt +++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/enum/EnumTypeList.kt @@ -3,8 +3,11 @@ package org.openrs2.cache.config.enum import org.openrs2.cache.Cache import org.openrs2.cache.Js5Archive import org.openrs2.cache.config.ArchiveConfigTypeList +import javax.inject.Inject +import javax.inject.Singleton -public class EnumTypeList(cache: Cache) : ArchiveConfigTypeList( +@Singleton +public class EnumTypeList @Inject constructor(cache: Cache) : ArchiveConfigTypeList( cache, archive = Js5Archive.CONFIG_ENUM, fileBits = 8 diff --git a/cache-550/src/main/kotlin/org/openrs2/cache/config/param/ParamTypeList.kt b/cache-550/src/main/kotlin/org/openrs2/cache/config/param/ParamTypeList.kt index b49062eb..0c90ead4 100644 --- a/cache-550/src/main/kotlin/org/openrs2/cache/config/param/ParamTypeList.kt +++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/param/ParamTypeList.kt @@ -4,8 +4,11 @@ import org.openrs2.cache.Cache import org.openrs2.cache.Js5Archive import org.openrs2.cache.Js5ConfigGroup import org.openrs2.cache.config.GroupConfigTypeList +import javax.inject.Inject +import javax.inject.Singleton -public class ParamTypeList(cache: Cache) : GroupConfigTypeList( +@Singleton +public class ParamTypeList @Inject constructor(cache: Cache) : GroupConfigTypeList( cache, archive = Js5Archive.CONFIG, group = Js5ConfigGroup.PARAMTYPE diff --git a/cache-550/src/main/kotlin/org/openrs2/cache/config/struct/StructTypeList.kt b/cache-550/src/main/kotlin/org/openrs2/cache/config/struct/StructTypeList.kt index 13574c52..1a0574e2 100644 --- a/cache-550/src/main/kotlin/org/openrs2/cache/config/struct/StructTypeList.kt +++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/struct/StructTypeList.kt @@ -4,8 +4,11 @@ import org.openrs2.cache.Cache import org.openrs2.cache.Js5Archive import org.openrs2.cache.Js5ConfigGroup import org.openrs2.cache.config.GroupConfigTypeList +import javax.inject.Inject +import javax.inject.Singleton -public class StructTypeList(cache: Cache) : GroupConfigTypeList( +@Singleton +public class StructTypeList @Inject constructor(cache: Cache) : GroupConfigTypeList( cache, archive = Js5Archive.CONFIG, group = Js5ConfigGroup.STRUCTTYPE diff --git a/cache-550/src/main/kotlin/org/openrs2/cache/config/varbit/VarbitTypeList.kt b/cache-550/src/main/kotlin/org/openrs2/cache/config/varbit/VarbitTypeList.kt index 70d408db..b458b555 100644 --- a/cache-550/src/main/kotlin/org/openrs2/cache/config/varbit/VarbitTypeList.kt +++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/varbit/VarbitTypeList.kt @@ -3,8 +3,11 @@ package org.openrs2.cache.config.varbit import org.openrs2.cache.Cache import org.openrs2.cache.Js5Archive import org.openrs2.cache.config.ArchiveConfigTypeList +import javax.inject.Inject +import javax.inject.Singleton -public class VarbitTypeList(cache: Cache) : ArchiveConfigTypeList( +@Singleton +public class VarbitTypeList @Inject constructor(cache: Cache) : ArchiveConfigTypeList( cache, archive = Js5Archive.CONFIG_VAR_BIT, fileBits = 10 diff --git a/cache-550/src/main/kotlin/org/openrs2/cache/config/varp/VarpTypeList.kt b/cache-550/src/main/kotlin/org/openrs2/cache/config/varp/VarpTypeList.kt index ecb3cd00..518586f5 100644 --- a/cache-550/src/main/kotlin/org/openrs2/cache/config/varp/VarpTypeList.kt +++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/varp/VarpTypeList.kt @@ -4,8 +4,11 @@ import org.openrs2.cache.Cache import org.openrs2.cache.Js5Archive import org.openrs2.cache.Js5ConfigGroup import org.openrs2.cache.config.GroupConfigTypeList +import javax.inject.Inject +import javax.inject.Singleton -public class VarpTypeList(cache: Cache) : GroupConfigTypeList( +@Singleton +public class VarpTypeList @Inject constructor(cache: Cache) : GroupConfigTypeList( cache, archive = Js5Archive.CONFIG, group = Js5ConfigGroup.VAR_PLAYER