annotate initialize method @NotNull

This commit is contained in:
dfsek
2022-08-21 13:40:19 -07:00
parent fcffefe91d
commit 710c00b0d8
31 changed files with 95 additions and 31 deletions
@@ -24,6 +24,8 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import org.jetbrains.annotations.NotNull;
public class BiomeExtrusionAddon implements MonadAddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<Extrusion>>> EXTRUSION_REGISTRY_KEY = new TypeKey<>() {
@@ -34,7 +36,7 @@ public class BiomeExtrusionAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -23,13 +23,15 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import org.jetbrains.annotations.NotNull;
public class ImageBiomeProviderAddon implements MonadAddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
};
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -37,6 +37,8 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import org.jetbrains.annotations.NotNull;
public class BiomePipelineAddon implements MonadAddonInitializer {
@@ -49,7 +51,7 @@ public class BiomePipelineAddon implements MonadAddonInitializer {
};
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -22,13 +22,15 @@ import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import org.jetbrains.annotations.NotNull;
public class SingleBiomeProviderAddon implements MonadAddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
};
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -15,12 +15,14 @@ import com.dfsek.terra.api.properties.PropertyKey;
import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.world.biome.Biome;
import org.jetbrains.annotations.NotNull;
public class BiomeQueryAPIAddon implements MonadAddonInitializer {
public static PropertyKey<BiomeTagHolder> BIOME_TAG_KEY = Context.create(BiomeTagHolder.class);
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -26,10 +26,12 @@ import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.util.generic.Construct;
import com.dfsek.terra.api.world.biome.Biome;
import org.jetbrains.annotations.NotNull;
public class NoiseChunkGenerator3DAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
PropertyKey<PaletteInfo> paletteInfoPropertyKey = Context.create(PaletteInfo.class);
PropertyKey<BiomeNoiseProperties> noisePropertiesPropertyKey = Context.create(BiomeNoiseProperties.class);
return Do.with(
@@ -14,15 +14,17 @@ import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
public class AddonsCommandAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
Get.platform(),
((functionalEventHandler, base, platform) -> Init.ofPure(
((functionalEventHandler, base, platform) -> Init.unit() /* Init.ofPure(
functionalEventHandler
.register(base, CommandRegistrationEvent.class)
.then(event -> {
@@ -69,7 +71,7 @@ public class AddonsCommandAddon implements MonadAddonInitializer {
context.getSender().sendMessage(addonInfo.toString());
})
);
})))
}))*/)
);
}
}
@@ -9,6 +9,7 @@ import com.dfsek.terra.addons.manifest.api.monad.Get;
import com.dfsek.terra.addons.manifest.api.monad.Init;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -22,7 +23,7 @@ public class PacksCommandAddon implements MonadAddonInitializer {
private static final Logger logger = LoggerFactory.getLogger(PacksCommandAddon.class);
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -11,6 +11,7 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +27,7 @@ public class ProfilerCommandAddon implements MonadAddonInitializer {
private static final Logger logger = LoggerFactory.getLogger(ProfilerCommandAddon.class);
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -27,6 +27,8 @@ import com.dfsek.terra.api.util.Rotation;
import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.util.reflection.TypeKey;
import org.jetbrains.annotations.NotNull;
public class StructureCommandAddon implements MonadAddonInitializer {
private static Registry<Structure> getStructureRegistry(CommandContext<CommandSender> sender) {
@@ -34,7 +36,7 @@ public class StructureCommandAddon implements MonadAddonInitializer {
}
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -20,10 +20,12 @@ 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 org.jetbrains.annotations.NotNull;
public class BiomeAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -32,13 +32,15 @@ import com.dfsek.terra.api.structure.feature.Distributor;
import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.util.reflection.TypeKey;
import org.jetbrains.annotations.NotNull;
public class DistributorAddon implements MonadAddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<Distributor>>> DISTRIBUTOR_TOKEN = new TypeKey<>() {
};
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -18,10 +18,12 @@ 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 org.jetbrains.annotations.NotNull;
public class FeatureAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -20,10 +20,12 @@ 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 org.jetbrains.annotations.NotNull;
public class FloraAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -42,6 +42,8 @@ import com.dfsek.terra.api.structure.feature.Locator;
import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.util.reflection.TypeKey;
import org.jetbrains.annotations.NotNull;
public class LocatorAddon implements MonadAddonInitializer {
@@ -51,7 +53,7 @@ public class LocatorAddon implements MonadAddonInitializer {
};
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -61,13 +61,15 @@ import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.util.reflection.TypeKey;
import org.jetbrains.annotations.NotNull;
public class NoiseAddon implements MonadAddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<NoiseSampler>>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {
};
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -15,10 +15,12 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
public class OreAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(manager -> manager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -17,10 +17,12 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
public class PaletteAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -15,10 +15,12 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
public class StructureAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -36,6 +36,8 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
import org.jetbrains.annotations.NotNull;
public class FeatureGenerationAddon implements MonadAddonInitializer {
public static final TypeKey<Supplier<ObjectTemplate<GenerationStage>>> STAGE_TYPE_KEY = new TypeKey<>() {
@@ -47,7 +49,7 @@ public class FeatureGenerationAddon implements MonadAddonInitializer {
@SuppressWarnings("unchecked")
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
PropertyKey<BiomeFeatures> biomeFeaturesKey = Context.create(BiomeFeatures.class);
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
@@ -11,10 +11,12 @@ import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.util.generic.Construct;
import com.dfsek.terra.api.world.biome.Biome;
import org.jetbrains.annotations.NotNull;
public class StructureGenerationAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -16,6 +16,7 @@ import com.dfsek.terra.addons.manifest.api.monad.Init;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,7 +28,7 @@ public class YamlAddon implements MonadAddonInitializer {
private static final Logger LOGGER = LoggerFactory.getLogger(YamlAddon.class);
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -3,7 +3,12 @@ package com.dfsek.terra.addons.manifest.api;
import com.dfsek.terra.addons.manifest.api.monad.Init;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
public interface MonadAddonInitializer {
@NotNull
@Contract(pure = true)
Monad<?, Init<?>> initialize();
}
@@ -47,6 +47,10 @@ public class Init<T> implements Monad<T, Init<?>> {
return ofPure(u);
}
public static Monad<Void, Init<?>> unit() {
return Init.unit(a -> {});
}
public static <T> Init<T> ofPure(T t) {
return of(Functions.constant(t));
}
@@ -10,11 +10,13 @@ import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.util.function.monad.Monad;
import com.dfsek.terra.api.world.chunk.generation.util.Palette;
import org.jetbrains.annotations.NotNull;
public class PaletteBlockShortcutAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -13,10 +13,12 @@ import com.dfsek.terra.api.inject.annotations.Inject;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
public class StructureBlockShortcutAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -11,10 +11,12 @@ 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 org.jetbrains.annotations.NotNull;
public class StructureMutatorAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -36,6 +36,8 @@ import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.util.StringUtil;
import org.jetbrains.annotations.NotNull;
public class SpongeSchematicAddon implements MonadAddonInitializer {
private static InputStream detectDecompression(InputStream is) throws IOException {
@@ -50,7 +52,7 @@ public class SpongeSchematicAddon implements MonadAddonInitializer {
}
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -22,10 +22,12 @@ import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.util.StringUtil;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
public class TerraScriptAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),
@@ -5,13 +5,15 @@ import com.dfsek.terra.addons.manifest.api.monad.Init;
import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
import static com.dfsek.terra.addons.manifest.api.monad.Get.platform;
import static com.dfsek.terra.addons.manifest.api.monad.Register.register;
public class TerraScriptCheckFunctionAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return platform().bind(platform -> register(FunctionBuilder.class, "check", new CheckFunctionBuilder(platform)));
}
}
@@ -10,10 +10,12 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.util.function.monad.Monad;
import org.jetbrains.annotations.NotNull;
public class TerraScriptSamplerFunctionAddon implements MonadAddonInitializer {
@Override
public Monad<?, Init<?>> initialize() {
public @NotNull Monad<?, Init<?>> initialize() {
return Do.with(
Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
Get.addon(),