Refactor a bunch of old APIs, add some new APIs, and add fallback addon

common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddon.java → common/addons/addon-loader-api/src/main/java/com/dfsek/terra/addon/loader/ApiAddon.java

@@ -15,7 +15,7 @@ public ApiAddon(Version version, String id) {
     }
 
     @Override
-    public Version getVersion() {
+    public Version version() {
         return version;
     }
 

common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java → common/addons/addon-loader-api/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java

@@ -33,7 +33,7 @@ public String getID() {
     }
 
     @Override
-    public Version getVersion() {
+    public Version version() {
         return VERSION;
     }
 }

common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java → common/addons/addon-loader-manifest/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java

@@ -66,12 +66,12 @@ public void initialize() {
     }
 
     @Override
-    public Map<String, VersionRange> getDependencies() {
+    public Map<String, VersionRange> dependencies() {
         return manifest.getDependencies();
     }
 
     @Override
-    public Version getVersion() {
+    public Version version() {
         return manifest.getVersion();
     }
 }

common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java → common/addons/addon-loader-manifest/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java

@@ -132,7 +132,7 @@ public String getID() {
     }
 
     @Override
-    public Version getVersion() {
+    public Version version() {
         return VERSION;
     }
 }

common/addons/api-biome-query/build.gradle.kts

@@ -0,0 +1,5 @@
+version = version("1.0.0")
+
+dependencies {
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
+}

common/addons/biome-query-api/src/main/resources/terra.addon.yml → common/addons/api-biome-query/src/main/resources/terra.addon.yml

@@ -1,7 +1,7 @@
 schema-version: 1
 contributors:
   - Terra contributors
-id: biome-query-api
+id: api-biome-query
 version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.biome.query.BiomeQueryAPIAddon"

common/addons/api-image/build.gradle.kts

@@ -0,0 +1,7 @@
+version = version("1.1.0")
+
+dependencies {
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
+
+
+}

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java → common/addons/api-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java

@@ -17,7 +17,7 @@
 import com.dfsek.terra.addons.image.image.SuppliedImage;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.properties.Properties;
-import com.dfsek.terra.api.util.generic.Lazy;
+import com.dfsek.terra.api.util.generic.Memo;
 
 import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR;
 
@@ -41,7 +41,7 @@ public static Image load(String path, ConfigPack pack) throws IOException {
                 return new SuppliedImage(() -> images.cache.get(path));
             } else {
                 // If images do not time out, image can be lazily loaded once instead of performing cache lookups for each image operation
-                Lazy<Image> lazyImage = Lazy.lazy(() -> images.cache.get(path));
+                Memo<Image> lazyImage = Memo.lazy(() -> images.cache.get(path));
                 return new SuppliedImage(lazyImage::value);
             }
         }

common/addons/library-image/src/main/resources/terra.addon.yml → common/addons/api-image/src/main/resources/terra.addon.yml

@@ -1,7 +1,7 @@
 schema-version: 1
 contributors:
   - Terra contributors
-id: library-image
+id: api-image
 version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.image.ImageLibraryAddon"

common/addons/biome-provider-extrusion/build.gradle.kts

@@ -1,6 +1,6 @@
 version = version("1.0.0")
 
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    compileOnlyApi(project(":common:addons:biome-query-api"))
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
+    compileOnlyApi(project(":common:addons:api-biome-query"))
 }

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/BiomeExtrusionProvider.java

@@ -9,6 +9,7 @@
 import com.dfsek.terra.addons.biome.extrusion.utils.ExtrusionPipeline;
 import com.dfsek.terra.addons.biome.extrusion.utils.ExtrusionPipelineFactory;
 import com.dfsek.terra.api.util.Column;
+import com.dfsek.terra.api.util.generic.data.types.Maybe;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
@@ -39,11 +40,11 @@ public Biome getBiome(int x, int y, int z, long seed) {
     public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
         return delegate.getBaseBiome(x, z, seed)
             .map(base -> (Column<Biome>) new BaseBiomeColumn(this, base, min, max, x, z, seed))
-            .orElseGet(() -> BiomeProvider.super.getColumn(x, z, seed, min, max));
+            .get(() -> BiomeProvider.super.getColumn(x, z, seed, min, max));
     }
 
     @Override
-    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
+    public Maybe<Biome> getBaseBiome(int x, int z, long seed) {
         return delegate.getBaseBiome(x, z, seed);
     }
 

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/ReplaceableBiomeLoader.java

@@ -27,6 +27,6 @@ public ReplaceableBiome load(@NotNull AnnotatedType t, @NotNull Object c, @NotNu
         return biomeRegistry
             .getByID((String) c)
             .map(ReplaceableBiome::of)
-            .orElseThrow(() -> new LoadException("No such biome: " + c, depthTracker));
+            .collectThrow(left -> new LoadException("No such biome: " + c + ": " + left, depthTracker));
     }
 }

common/addons/biome-provider-extrusion/src/main/resources/terra.addon.yml

@@ -11,4 +11,4 @@ website:
   docs: https://terra.polydev.org
 license: MIT License
 depends:
-  biome-query-api: "1.+"
+  api-biome-query: "1.+"

common/addons/biome-provider-image/README.md

@@ -1,5 +1,5 @@
 # biome-provider-image-v2
 
 Implements and registers the `IMAGE` biome provider, which
-utilizes various config types provided by the `library-image` addon to
+utilizes various config types provided by the `api-image` addon to
 distribute biomes based on images.

common/addons/biome-provider-image/build.gradle.kts

@@ -1,8 +1,8 @@
 version = version("2.0.0")
 
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    compileOnlyApi(project(":common:addons:library-image"))
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
+    compileOnlyApi(project(":common:addons:api-image"))
 
 
 }

common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java

@@ -11,6 +11,7 @@
 
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.api.util.generic.data.types.Maybe;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
@@ -40,8 +41,8 @@ public Biome getBiome(int x, int z) {
     }
 
     @Override
-    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
-        return Optional.of(getBiome(x, z));
+    public Maybe<Biome> getBaseBiome(int x, int z, long seed) {
+        return Maybe.just(getBiome(x, z));
     }
 
     @Override

common/addons/biome-provider-image/src/main/resources/terra.addon.yml

@@ -11,4 +11,4 @@ website:
   docs: https://terra.polydev.org
 license: MIT License
 depends:
-  library-image: "1.+"
+  api-image: "1.+"

common/addons/biome-provider-pipeline/build.gradle.kts

@@ -1,5 +1,5 @@
 version = version("2.0.0")
 
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/PipelineBiomeProvider.java

@@ -8,6 +8,9 @@
 package com.dfsek.terra.addons.biome.pipeline;
 
 import com.dfsek.seismic.type.sampler.Sampler;
+
+import com.dfsek.terra.api.util.generic.data.types.Maybe;
+
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 
@@ -106,8 +109,8 @@ public Iterable<Biome> getBiomes() {
     }
 
     @Override
-    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
-        return Optional.of(getBiome(x, z, seed));
+    public Maybe<Biome> getBaseBiome(int x, int z, long seed) {
+        return Maybe.just(getBiome(x, z, seed));
     }
 
     @Override

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/PipelineBiomeLoader.java

@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.AnnotatedType;
+import java.util.function.Function;
 
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.registry.Registry;
@@ -27,6 +28,6 @@ public PipelineBiome load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull
         return biomeRegistry
             .getByID((String) c)
             .map(PipelineBiome::from)
-            .orElseGet(() -> PipelineBiome.placeholder((String) c));
+            .collect(left -> PipelineBiome.placeholder((String) c), Function.identity());
     }
 }

common/addons/biome-provider-single/build.gradle.kts

@@ -1,5 +1,5 @@
 version = version("1.0.0")
 
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
 }

common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java

@@ -8,27 +8,22 @@
 package com.dfsek.terra.addons.biome.single;
 
 import java.util.Collections;
-import java.util.Optional;
 
+import com.dfsek.terra.api.util.generic.data.types.Maybe;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
-public class SingleBiomeProvider implements BiomeProvider {
-    private final Biome biome;
-
-    public SingleBiomeProvider(Biome biome) {
-        this.biome = biome;
-    }
+public record SingleBiomeProvider(Biome biome) implements BiomeProvider {
 
     @Override
     public Biome getBiome(int x, int y, int z, long seed) {
         return biome;
     }
 
     @Override
-    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
-        return Optional.of(biome);
+    public Maybe<Biome> getBaseBiome(int x, int z, long seed) {
+        return Maybe.just(biome);
     }
 
     @Override

common/addons/chunk-generator-noise-3d/build.gradle.kts

@@ -1,5 +1,5 @@
 version = version("1.2.1")
 
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java

@@ -30,7 +30,7 @@ public ElevationInterpolator(long seed, int chunkX, int chunkZ, BiomeProvider pr
                 gens[x + 1 + smooth][z + 1 + smooth] =
                     provider
                         .getBaseBiome(bx, bz, seed)
-                        .orElseGet(() -> provider.getBiome(bx, 0, bz, seed)) // kind of a hack
+                        .get(() -> provider.getBiome(bx, 0, bz, seed)) // kind of a hack
                         .getContext()
                         .get(noisePropertiesKey);
             }

common/addons/command-addons/build.gradle.kts

@@ -1,5 +1,5 @@
 version = version("1.0.0")
 
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
 }

common/addons/command-addons/src/main/java/com/dfsek/terra/addons/commands/addons/AddonsCommandAddon.java

@@ -39,7 +39,7 @@ public void initialize() {
                                         .append(" - ")
                                         .append(addon.getID())
                                         .append('@')
-                                        .append(addon.getVersion().getFormatted())
+                                        .append(addon.version().getFormatted())
                                         .append('\n'));
                                 context.sender().sendMessage(addons.toString());
                             })
@@ -52,10 +52,10 @@ public void initialize() {
                                 BaseAddon addon = context.get("addon");
                                 StringBuilder addonInfo = new StringBuilder("Addon ").append(addon.getID()).append('\n');
 
-                                addonInfo.append("Version: ").append(addon.getVersion().getFormatted()).append('\n');
+                                addonInfo.append("Version: ").append(addon.version().getFormatted()).append('\n');
 
                                 addonInfo.append("Dependencies:\n");
-                                addon.getDependencies().forEach((id, versions) -> addonInfo
+                                addon.dependencies().forEach((id, versions) -> addonInfo
                                     .append(" - ")
                                     .append(id)
                                     .append('@')

common/addons/command-locate/build.gradle.kts

@@ -1,5 +1,5 @@
 version = version("1.0.0")
 
 dependencies {
-    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:addon-loader-manifest"))
 }