diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java index a7584f2a5..005bc951a 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java @@ -15,11 +15,8 @@ import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer; import com.dfsek.terra.addons.manifest.api.monad.Do; import com.dfsek.terra.addons.manifest.api.monad.Get; import com.dfsek.terra.addons.manifest.api.monad.Init; -import com.dfsek.terra.api.Platform; -import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.function.monad.Monad; import com.dfsek.terra.api.util.reflection.TypeKey; @@ -30,12 +27,6 @@ public class SingleBiomeProviderAddon implements MonadAddonInitializer { public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() { }; - @Inject - private Platform platform; - - @Inject - private BaseAddon addon; - @Override public Monad> initialize() { return Do.with( @@ -43,11 +34,11 @@ public class SingleBiomeProviderAddon implements MonadAddonInitializer { Get.addon(), Get.platform(), ((handler, base, platform) -> Init.ofPure( - handler.register(addon, ConfigPackPreLoadEvent.class) + handler.register(base, ConfigPackPreLoadEvent.class) .then(event -> { CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( PROVIDER_REGISTRY_KEY); - providerRegistry.register(addon.key("SINGLE"), SingleBiomeProviderTemplate::new); + providerRegistry.register(base.key("SINGLE"), SingleBiomeProviderTemplate::new); }) .failThrough())) ); diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java index ab8980ebc..585a4e270 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java @@ -11,30 +11,20 @@ import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer; import com.dfsek.terra.addons.manifest.api.monad.Do; import com.dfsek.terra.addons.manifest.api.monad.Get; import com.dfsek.terra.addons.manifest.api.monad.Init; -import com.dfsek.terra.api.Platform; -import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.util.function.monad.Monad; public class StructureAddon implements MonadAddonInitializer { - @Inject - private Platform platform; - - @Inject - private BaseAddon addon; - @Override public Monad> initialize() { return Do.with( Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)), Get.addon(), - Get.platform(), - ((handler, base, platform) -> Init.ofPure( - handler.register(addon, ConfigPackPreLoadEvent.class) - .then(event -> event.getPack().registerConfigType(new StructureConfigType(), addon.key("STRUCTURE"), 2)) + ((handler, base) -> Init.ofPure( + handler.register(base, ConfigPackPreLoadEvent.class) + .then(event -> event.getPack().registerConfigType(new StructureConfigType(), base.key("STRUCTURE"), 2)) .failThrough())) ); }