Add bindings to each platform

Author: jacoballen1

anvil-bungee/src/main/kotlin/org/anvilpowered/anvil/bungee/module/ApiBungeeModule.kt

@@ -24,6 +24,7 @@ import org.anvilpowered.anvil.api.command.CommandExecuteService
 import org.anvilpowered.anvil.api.misc.bind
 import org.anvilpowered.anvil.api.misc.to
 import org.anvilpowered.anvil.api.server.LocationService
+import org.anvilpowered.anvil.api.util.InfoDumpService
 import org.anvilpowered.anvil.api.util.KickService
 import org.anvilpowered.anvil.api.util.PermissionService
 import org.anvilpowered.anvil.api.util.TextService
@@ -37,6 +38,7 @@ import org.anvilpowered.anvil.bungee.util.BungeeUserService
 import org.anvilpowered.anvil.common.PlatformImpl
 import org.anvilpowered.anvil.common.module.JavaUtilLoggingAdapter
 import org.anvilpowered.anvil.common.module.PlatformModule
+import org.anvilpowered.anvil.common.util.CommonInfoDumpService
 import org.anvilpowered.anvil.common.util.CommonTextService
 import org.anvilpowered.anvil.common.util.SendTextService
 
@@ -53,6 +55,8 @@ class ApiBungeeModule : PlatformModule(
     with(binder()) {
       bind<CommandExecuteService>().to<BungeeCommandExecuteService>()
       bind<KickService>().to<BungeeKickService>()
+      bind<InfoDumpService<CommandSender>>().to<CommonInfoDumpService<CommandSender>>()
+      bind<InfoDumpService<*>>().to<CommonInfoDumpService<CommandSender>>()
       bind<LocationService>().to<BungeeLocationService>()
       bind<PermissionService>().to<BungeePermissionService>()
       bind<SendTextService<CommandSender>>().to<BungeeSendTextService>()

anvil-common/src/main/kotlin/org/anvilpowered/anvil/common/module/CommonModule.kt

@@ -25,20 +25,20 @@ import jetbrains.exodus.entitystore.PersistentEntityStore
 import ninja.leaping.configurate.commented.CommentedConfigurationNode
 import ninja.leaping.configurate.hocon.HoconConfigurationLoader
 import ninja.leaping.configurate.loader.ConfigurationLoader
+import org.anvilpowered.anvil.api.coremember.CoreMemberManager
 import org.anvilpowered.anvil.api.coremember.CoreMemberRepository
 import org.anvilpowered.anvil.api.misc.bind
 import org.anvilpowered.anvil.api.misc.to
 import org.anvilpowered.anvil.api.misc.withMongoDB
 import org.anvilpowered.anvil.api.misc.withXodus
 import org.anvilpowered.anvil.api.plugin.PluginInfo
 import org.anvilpowered.anvil.api.registry.Registry
-import org.anvilpowered.anvil.api.util.InfoDumpService
 import org.anvilpowered.anvil.common.command.CommonCallbackCommand
+import org.anvilpowered.anvil.common.coremember.CommonCoreMemberManager
 import org.anvilpowered.anvil.common.coremember.CommonMongoCoreMemberRepository
 import org.anvilpowered.anvil.common.coremember.CommonXodusCoreMemberRepository
 import org.anvilpowered.anvil.common.plugin.AnvilPluginInfo
 import org.anvilpowered.anvil.common.registry.CommonConfigurationService
-import org.anvilpowered.anvil.common.util.CommonInfoDumpService
 import org.bson.types.ObjectId
 import java.nio.file.Paths
 
@@ -58,8 +58,7 @@ abstract class CommonModule<TCommandSource>(private val configDir: String) : Api
         .to<CommonXodusCoreMemberRepository>()
       bind<CoreMemberRepository<EntityId, PersistentEntityStore>>()
         .to<CommonXodusCoreMemberRepository>()
-      bind<InfoDumpService<TCommandSource>>()
-        .to<CommonInfoDumpService<TCommandSource>>()
+      bind<CoreMemberManager>().to<CommonCoreMemberManager>()
 
       withMongoDB()
       withXodus()

anvil-nukkit/src/main/kotlin/org/anvilpowered/anvil/nukkit/module/ApiNukkitModule.kt

@@ -26,13 +26,15 @@ import org.anvilpowered.anvil.api.command.SimpleCommandService
 import org.anvilpowered.anvil.api.misc.bind
 import org.anvilpowered.anvil.api.misc.to
 import org.anvilpowered.anvil.api.server.LocationService
+import org.anvilpowered.anvil.api.util.InfoDumpService
 import org.anvilpowered.anvil.api.util.KickService
 import org.anvilpowered.anvil.api.util.PermissionService
 import org.anvilpowered.anvil.api.util.TextService
 import org.anvilpowered.anvil.api.util.UserService
 import org.anvilpowered.anvil.common.PlatformImpl
 import org.anvilpowered.anvil.common.entity.EntityUtils
 import org.anvilpowered.anvil.common.module.PlatformModule
+import org.anvilpowered.anvil.common.util.CommonInfoDumpService
 import org.anvilpowered.anvil.common.util.CommonTextService
 import org.anvilpowered.anvil.common.util.SendTextService
 import org.anvilpowered.anvil.nukkit.command.NukkitCommandExecuteService
@@ -56,8 +58,10 @@ class ApiNukkitModule : PlatformModule(
     super.configure()
     with(binder()) {
       bind<CommandExecuteService>().to<NukkitCommandExecuteService>()
-      bind<KickService>().to<NukkitKickService>()
       bind<EntityUtils>().to<NukkitEntityUtils>()
+      bind<InfoDumpService<CommandSender>>().to<CommonInfoDumpService<CommandSender>>()
+      bind<InfoDumpService<*>>().to<CommonInfoDumpService<CommandSender>>()
+      bind<KickService>().to<NukkitKickService>()
       bind<LocationService>().to<NukkitLocationService>()
       bind<PermissionService>().to<NukkitPermissionService>()
       bind<SendTextService<CommandSender>>().to<NukkitSendTextService>()

anvil-spigot/src/main/kotlin/org/anvilpowered/anvil/spigot/module/ApiSpigotModule.kt

@@ -22,6 +22,7 @@ import org.anvilpowered.anvil.api.command.SimpleCommandService
 import org.anvilpowered.anvil.api.misc.bind
 import org.anvilpowered.anvil.api.misc.to
 import org.anvilpowered.anvil.api.server.LocationService
+import org.anvilpowered.anvil.api.util.InfoDumpService
 import org.anvilpowered.anvil.api.util.KickService
 import org.anvilpowered.anvil.api.util.PermissionService
 import org.anvilpowered.anvil.api.util.TextService
@@ -30,6 +31,7 @@ import org.anvilpowered.anvil.common.PlatformImpl
 import org.anvilpowered.anvil.common.entity.EntityUtils
 import org.anvilpowered.anvil.common.module.JavaUtilLoggingAdapter
 import org.anvilpowered.anvil.common.module.PlatformModule
+import org.anvilpowered.anvil.common.util.CommonInfoDumpService
 import org.anvilpowered.anvil.common.util.CommonTextService
 import org.anvilpowered.anvil.common.util.SendTextService
 import org.anvilpowered.anvil.spigot.command.SpigotCommandExecuteService
@@ -56,14 +58,16 @@ class ApiSpigotModule : PlatformModule(
     super.configure()
     with(binder()) {
       bind<CommandExecuteService>().to<SpigotCommandExecuteService>()
-      bind<SimpleCommandService<CommandSender>>().to<SpigotSimpleCommandService>()
-      bind<SimpleCommandService<*>>().to<SpigotSimpleCommandService>()
-      bind<KickService>().to<SpigotKickService>()
       bind<EntityUtils>().to<SpigotEntityUtils>()
+      bind<InfoDumpService<CommandSender>>().to<CommonInfoDumpService<CommandSender>>()
+      bind<InfoDumpService<*>>().to<CommonInfoDumpService<CommandSender>>()
+      bind<KickService>().to<SpigotKickService>()
       bind<LocationService>().to<SpigotLocationService>()
       bind<PermissionService>().to<SpigotPermissionService>()
       bind<SendTextService<CommandSender>>().to<SpigotSendTextService>()
       bind<SendTextService<*>>().to<SpigotSendTextService>()
+      bind<SimpleCommandService<CommandSender>>().to<SpigotSimpleCommandService>()
+      bind<SimpleCommandService<*>>().to<SpigotSimpleCommandService>()
       bind<TextService<CommandSender>>().to<CommonTextService<CommandSender>>()
       bind<TextService<*>>().to<CommonTextService<CommandSender>>()
       bind<UserService<Player, Player>>().to<SpigotUserService>()

anvil-sponge/anvil-sponge-7/src/main/kotlin/org/anvilpowered/anvil/sponge7/module/ApiSponge7Module.kt

@@ -22,10 +22,12 @@ import org.anvilpowered.anvil.api.command.SimpleCommandService
 import org.anvilpowered.anvil.api.misc.bind
 import org.anvilpowered.anvil.api.misc.to
 import org.anvilpowered.anvil.api.server.LocationService
+import org.anvilpowered.anvil.api.util.InfoDumpService
 import org.anvilpowered.anvil.api.util.KickService
 import org.anvilpowered.anvil.api.util.TextService
 import org.anvilpowered.anvil.api.util.UserService
 import org.anvilpowered.anvil.common.PlatformImpl
+import org.anvilpowered.anvil.common.util.CommonInfoDumpService
 import org.anvilpowered.anvil.common.util.CommonTextService
 import org.anvilpowered.anvil.common.util.SendTextService
 import org.anvilpowered.anvil.sponge.module.ApiSpongeModule
@@ -52,11 +54,13 @@ class ApiSponge7Module : ApiSpongeModule(
     super.configure()
     with(binder()) {
       bind<CommandExecuteService>().to<Sponge7CommandExecuteService>()
-      bind<SimpleCommandService<CommandSource>>().to<Sponge7SimpleCommandService>()
+      bind<InfoDumpService<CommandSource>>().to<CommonInfoDumpService<CommandSource>>()
+      bind<InfoDumpService<*>>().to<CommonInfoDumpService<CommandSource>>()
       bind<KickService>().to<Sponge7KickService>()
       bind<LocationService>().to<Sponge7LocationService>()
       bind<SendTextService<CommandSource>>().to<Sponge7SendTextService>()
       bind<SendTextService<*>>().to<Sponge7SendTextService>()
+      bind<SimpleCommandService<CommandSource>>().to<Sponge7SimpleCommandService>()
       bind<TextService<CommandSource>>().to<CommonTextService<CommandSource>>()
       bind<TextService<*>>().to<CommonTextService<CommandSource>>()
       bind<UserService<User, Player>>().to<Sponge7UserService>()

anvil-sponge/anvil-sponge-8/src/main/kotlin/org/anvilpowered/anvil/sponge8/module/ApiSponge8Module.kt

@@ -23,11 +23,13 @@ import org.anvilpowered.anvil.api.misc.bind
 import org.anvilpowered.anvil.api.misc.to
 import org.anvilpowered.anvil.api.misc.toInternalProvider
 import org.anvilpowered.anvil.api.server.LocationService
+import org.anvilpowered.anvil.api.util.InfoDumpService
 import org.anvilpowered.anvil.api.util.KickService
 import org.anvilpowered.anvil.api.util.TextService
 import org.anvilpowered.anvil.api.util.UserService
 import org.anvilpowered.anvil.common.PlatformImpl
 import org.anvilpowered.anvil.common.command.CommonCallbackCommand
+import org.anvilpowered.anvil.common.util.CommonInfoDumpService
 import org.anvilpowered.anvil.common.util.CommonTextService
 import org.anvilpowered.anvil.common.util.SendTextService
 import org.anvilpowered.anvil.sponge.module.ApiSpongeModule
@@ -55,13 +57,15 @@ class ApiSponge8Module : ApiSpongeModule(
   override fun configure() {
     super.configure()
     with(binder()) {
-      bind<TextService<CommandCause>>().to<CommonTextService<CommandCause>>()
       bind<CommonCallbackCommand<CommandCause>>().toInternalProvider()
       bind<CommandExecuteService>().to<Sponge8CommandExecuteService>()
-      bind<SimpleCommandService<CommandCause>>().to<Sponge8SimpleCommandService>()
+      bind<InfoDumpService<CommandCause>>().to<CommonInfoDumpService<CommandCause>>()
+      bind<InfoDumpService<*>>().to<CommonInfoDumpService<CommandCause>>()
       bind<KickService>().to<Sponge8KickService>()
       bind<LocationService>().to<Sponge8LocationService>()
       bind<SendTextService<CommandCause>>().to<Sponge8SendTextService>()
+      bind<SimpleCommandService<CommandCause>>().to<Sponge8SimpleCommandService>()
+      bind<TextService<CommandCause>>().to<CommonTextService<CommandCause>>()
       bind<UserService<User, ServerPlayer>>().to<Sponge8UserService>()
     }
   }

anvil-velocity/src/main/kotlin/org/anvilpowered/anvil/velocity/module/ApiVelocityModule.kt

@@ -25,13 +25,15 @@ import org.anvilpowered.anvil.api.command.SimpleCommandService
 import org.anvilpowered.anvil.api.misc.bind
 import org.anvilpowered.anvil.api.misc.to
 import org.anvilpowered.anvil.api.server.LocationService
+import org.anvilpowered.anvil.api.util.InfoDumpService
 import org.anvilpowered.anvil.api.util.KickService
 import org.anvilpowered.anvil.api.util.PermissionService
 import org.anvilpowered.anvil.api.util.TextService
 import org.anvilpowered.anvil.api.util.UserService
 import org.anvilpowered.anvil.common.PlatformImpl
 import org.anvilpowered.anvil.common.command.CommonCallbackCommand
 import org.anvilpowered.anvil.common.module.PlatformModule
+import org.anvilpowered.anvil.common.util.CommonInfoDumpService
 import org.anvilpowered.anvil.common.util.CommonTextService
 import org.anvilpowered.anvil.common.util.SendTextService
 import org.anvilpowered.anvil.velocity.command.VelocityCommandExecuteService
@@ -54,14 +56,16 @@ class ApiVelocityModule : PlatformModule(
     with(binder()) {
       bind<CommonCallbackCommand<CommandSource>>()
       bind<CommandExecuteService>().to<VelocityCommandExecuteService>()
-      bind<SimpleCommandService<CommandSource>>().to<VelocitySimpleCommandService>()
+      bind<InfoDumpService<CommandSource>>().to<CommonInfoDumpService<CommandSource>>()
+      bind<InfoDumpService<*>>().to<CommonInfoDumpService<CommandSource>>()
       bind<KickService>().to<VelocityKickService>()
       bind<LocationService>().to<VelocityLocationService>()
       bind<PermissionService>().to<VelocityPermissionService>()
-      bind<TextService<CommandSource>>().to<CommonTextService<CommandSource>>()
-      bind<TextService<*>>().to<CommonTextService<CommandSource>>()
       bind<SendTextService<CommandSource>>().to<VelocitySendTextService>()
       bind<SendTextService<*>>().to<VelocitySendTextService>()
+      bind<SimpleCommandService<CommandSource>>().to<VelocitySimpleCommandService>()
+      bind<TextService<CommandSource>>().to<CommonTextService<CommandSource>>()
+      bind<TextService<*>>().to<CommonTextService<CommandSource>>()
       bind<UserService<Player, Player>>().to<VelocityUserService>()
     }
   }