Skip to content

Commit 9e7a073

Browse files
committed
Revert accidental changes
1 parent fa6a442 commit 9e7a073

File tree

7 files changed

+14
-7
lines changed

7 files changed

+14
-7
lines changed

anvil-bungee/src/main/kotlin/org/anvilpowered/anvil/bungee/AnvilBungee.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ class AnvilBungee : Plugin() {
6060
}
6161
}
6262

63-
override fun onEnable(){
64-
}
63+
override fun onEnable() = EnvironmentBuilderImpl.completeInitialization(ApiBungeeModule(), BungeeFallbackModule())
6564
override fun toString(): String = inner.toString()
6665
}

anvil-common/src/main/java/org/anvilpowered/anvil/api/EnvironmentBuilderImpl.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020

2121
import com.google.common.base.Preconditions;
2222
import com.google.common.reflect.TypeToken;
23-
import com.google.inject.*;
23+
import com.google.inject.AbstractModule;
24+
import com.google.inject.Guice;
25+
import com.google.inject.Injector;
26+
import com.google.inject.Key;
27+
import com.google.inject.Module;
28+
import com.google.inject.TypeLiteral;
2429
import com.google.inject.name.Names;
2530
import com.google.inject.util.Modules;
2631
import org.anvilpowered.anvil.api.misc._AbstractModuleKt;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ import org.anvilpowered.anvil.api.misc.withMongoDB
3333
import org.anvilpowered.anvil.api.misc.withXodus
3434
import org.anvilpowered.anvil.api.plugin.PluginInfo
3535
import org.anvilpowered.anvil.api.registry.Registry
36+
import org.anvilpowered.anvil.api.util.InfoDumpService
3637
import org.anvilpowered.anvil.common.command.CommonCallbackCommand
3738
import org.anvilpowered.anvil.common.coremember.CommonCoreMemberManager
3839
import org.anvilpowered.anvil.common.coremember.CommonMongoCoreMemberRepository
3940
import org.anvilpowered.anvil.common.coremember.CommonXodusCoreMemberRepository
4041
import org.anvilpowered.anvil.common.plugin.AnvilPluginInfo
4142
import org.anvilpowered.anvil.common.registry.CommonConfigurationService
43+
import org.anvilpowered.anvil.common.util.CommonInfoDumpService
4244
import org.bson.types.ObjectId
4345
import java.nio.file.Paths
4446

@@ -58,6 +60,8 @@ abstract class CommonModule<TCommandSource>(private val configDir: String) : Api
5860
.to<CommonXodusCoreMemberRepository>()
5961
bind<CoreMemberRepository<EntityId, PersistentEntityStore>>()
6062
.to<CommonXodusCoreMemberRepository>()
63+
bind<InfoDumpService<TCommandSource>>()
64+
.to<CommonInfoDumpService<TCommandSource>>()
6165

6266
bind<CoreMemberManager>().to<CommonCoreMemberManager>()
6367

anvil-spigot/src/main/kotlin/org/anvilpowered/anvil/spigot/AnvilSpigot.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ class AnvilSpigot : JavaPlugin() {
112112
Bukkit.getPluginManager().registerEvents(object : Listener {
113113
@EventHandler
114114
fun onLoad(event: ServerLoadEvent) {
115+
EnvironmentBuilderImpl.completeInitialization(ApiSpigotModule(), SpigotFallbackModule())
115116
}
116117
}, this)
117118
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class AnvilSponge7 @Inject constructor(
5252
) : AnvilImpl(injector, object : CommonModule<CommandSource>("config") {}) {
5353
@Listener(order = Order.EARLY)
5454
fun onInit(event: GameInitializationEvent) {
55+
EnvironmentBuilderImpl.completeInitialization(ApiSponge7Module(), Sponge7FallbackModule())
5556
Sponge.getEventManager().registerListeners(
5657
this,
5758
Anvil.environment.injector.getInstance(Sponge7PlayerListener::class.java)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class AnvilSponge8 @Inject constructor(
4646

4747
@Listener(order = Order.EARLY)
4848
fun onInit(event: LoadedGameEvent) {
49+
EnvironmentBuilderImpl.completeInitialization(ApiSponge8Module(), Sponge8FallbackModule())
4950
Sponge.eventManager().registerListeners(
5051
plugin,
5152
environment.injector.getInstance(Sponge8PlayerListener::class.java)

anvil-velocity/src/main/kotlin/org/anvilpowered/anvil/velocity/AnvilVelocity.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,4 @@ class AnvilVelocity @Inject constructor(injector: Injector) :
6565
super.applyToBuilder(builder)
6666
builder.addEarlyServices(object : TypeLiteral<CommonAnvilCommandNode<Player, Player, CommandSource>>() {})
6767
}
68-
69-
override fun whenLoaded(environment: Environment?) {
70-
super.whenLoaded(environment)
71-
}
7268
}

0 commit comments

Comments
 (0)