diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/RegistrationEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/RegistrationEvent.java deleted file mode 100644 index 3cb74a4d0..000000000 --- a/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/RegistrationEvent.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.dfsek.terra.api.event.events.config; - -import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.tectonic.loading.object.ObjectTemplate; - -import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.config.ConfigType; -import com.dfsek.terra.api.event.events.PackEvent; - -import java.lang.reflect.Type; -import java.util.function.Supplier; - - -public class RegistrationEvent implements PackEvent { - private final ConfigPack pack; - - public RegistrationEvent(ConfigPack pack) { - this.pack = pack; - } - - @Override - public ConfigPack getPack() { - return pack; - } - - public RegistrationEvent registerConfigType(ConfigType type, String id, int priority) { - pack.registerConfigType(type, id, priority); - return this; - } - - public RegistrationEvent applyLoader(Type type, Supplier> loader) { - pack.applyLoader(type, loader); - return this; - } - - public RegistrationEvent applyLoader(Type type, TypeLoader loader) { - pack.applyLoader(type, loader); - return this; - } -} diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index dfc011024..d33cad168 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -61,7 +61,6 @@ import com.dfsek.terra.api.config.Loader; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.event.events.config.ConfigurationDiscoveryEvent; import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; -import com.dfsek.terra.api.event.events.config.RegistrationEvent; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.events.config.type.ConfigTypePostLoadEvent; @@ -162,8 +161,6 @@ public class ConfigPackImpl implements ConfigPack { register(abstractConfigLoader); platform.register(abstractConfigLoader); - platform.getEventManager().callEvent(new RegistrationEvent(this)); - ConfigPackAddonsTemplate addonsTemplate = new ConfigPackAddonsTemplate(); selfLoader.load(addonsTemplate, packManifest); this.addons = addonsTemplate.getAddons();