mirrors/Terra
1
0 Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-25 13:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up unneeded injects

Browse Source
This commit is contained in:
dfsek committed 2022-08-18 16:52:46 -07:00
1 parent 74f9c4f9b1
commit c8beb0f965
2 files changed
+5 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java
+2 -11
View File
@@ -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.Do;
import com.dfsek.terra.addons.manifest.api.monad.Get; import com.dfsek.terra.addons.manifest.api.monad.Get;
import com.dfsek.terra.addons.manifest.api.monad.Init; 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.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler; 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.registry.CheckedRegistry;
import com.dfsek.terra.api.util.function.monad.Monad; import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.api.util.reflection.TypeKey;
@@ -30,12 +27,6 @@ public class SingleBiomeProviderAddon implements MonadAddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() { public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
}; };
@Inject
private Platform platform;
@Inject
private BaseAddon addon;
@Override @Override
public Monad<?, Init<?>> initialize() { public Monad<?, Init<?>> initialize() {
return Do.with( return Do.with(
@@ -43,11 +34,11 @@ public class SingleBiomeProviderAddon implements MonadAddonInitializer {
Get.addon(), Get.addon(),
Get.platform(), Get.platform(),
((handler, base, platform) -> Init.ofPure( ((handler, base, platform) -> Init.ofPure(
handler.register(addon, ConfigPackPreLoadEvent.class) handler.register(base, ConfigPackPreLoadEvent.class)
.then(event -> { .then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry( CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
PROVIDER_REGISTRY_KEY); PROVIDER_REGISTRY_KEY);
providerRegistry.register(addon.key("SINGLE"), SingleBiomeProviderTemplate::new); providerRegistry.register(base.key("SINGLE"), SingleBiomeProviderTemplate::new);
}) })
.failThrough())) .failThrough()))
); );
common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java
+3 -13
View File
@@ -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.Do;
import com.dfsek.terra.addons.manifest.api.monad.Get; import com.dfsek.terra.addons.manifest.api.monad.Get;
import com.dfsek.terra.addons.manifest.api.monad.Init; 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.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler; 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; import com.dfsek.terra.api.util.function.monad.Monad;
public class StructureAddon implements MonadAddonInitializer { public class StructureAddon implements MonadAddonInitializer {
@Inject
private Platform platform;
@Inject
private BaseAddon addon;
@Override @Override
public Monad<?, Init<?>> initialize() { public Monad<?, Init<?>> initialize() {
return Do.with( return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)), Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(), Get.addon(),
Get.platform(), ((handler, base) -> Init.ofPure(
((handler, base, platform) -> Init.ofPure( handler.register(base, ConfigPackPreLoadEvent.class)
handler.register(addon, ConfigPackPreLoadEvent.class) .then(event -> event.getPack().registerConfigType(new StructureConfigType(), base.key("STRUCTURE"), 2))
.then(event -> event.getPack().registerConfigType(new StructureConfigType(), addon.key("STRUCTURE"), 2))
.failThrough())) .failThrough()))
); );
} }