convert a bunch of stuff to new APIs

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

@@ -27,6 +27,6 @@ public class ReplaceableBiomeLoader implements TypeLoader<ReplaceableBiome> {
         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-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/PipelineBiomeLoader.java

@@ -7,6 +7,7 @@ import com.dfsek.tectonic.api.loader.type.TypeLoader;
 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 class PipelineBiomeLoader implements TypeLoader<PipelineBiome> {
         return biomeRegistry
             .getByID((String) c)
             .map(PipelineBiome::from)
-            .orElseGet(() -> PipelineBiome.placeholder((String) c));
+            .collect(left -> PipelineBiome.placeholder((String) c), Function.identity());
     }
 }

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

@@ -41,7 +41,7 @@ public class LocateCommandAddon implements AddonInitializer {
     private BaseAddon addon;
 
     private static Registry<Biome> getBiomeRegistry(CommandContext<CommandSender> sender) {
-        return sender.sender().getEntity().orElseThrow().world().getPack().getRegistry(Biome.class);
+        return sender.sender().getEntity().orThrow().world().getPack().getRegistry(Biome.class);
     }
 
     @Override
@@ -69,7 +69,7 @@ public class LocateCommandAddon implements AddonInitializer {
                         .handler(context -> {
                             // 1. Gather Context & Arguments
                             Biome targetBiome = context.get("biome");
-                            Entity sender = context.sender().getEntity().orElseThrow(
+                            Entity sender = context.sender().getEntity().orThrow(
                                 () -> new Error("Only entities can run this command."));
                             World world = sender.world();
 

common/addons/command-structures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java

@@ -34,7 +34,7 @@ public class StructureCommandAddon implements AddonInitializer {
     private BaseAddon addon;
 
     private static Registry<Structure> getStructureRegistry(CommandContext<CommandSender> sender) {
-        return sender.sender().getEntity().orElseThrow().world().getPack().getRegistry(Structure.class);
+        return sender.sender().getEntity().orThrow().world().getPack().getRegistry(Structure.class);
     }
 
     @Override
@@ -55,7 +55,7 @@ public class StructureCommandAddon implements AddonInitializer {
                         .optional("rotation", EnumParser.enumParser(Rotation.class), DefaultValue.constant(Rotation.NONE))
                         .handler(context -> {
                             Structure structure = context.get("structure");
-                            Entity sender = context.sender().getEntity().orElseThrow();
+                            Entity sender = context.sender().getEntity().orThrow();
                             structure.generate(
                                 sender.position().toInt(),
                                 sender.world(),

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java

@@ -64,7 +64,7 @@ public class LootFunction implements Function<Void> {
 
 
         registry.get(RegistryKey.parse(id))
-            .ifPresentOrElse(table -> {
+            .consume(table -> {
                     Vector3 apply = Vector3.of(FloatingPointFunctions.round(xz.getX()),
                         y.apply(implementationArguments, scope)
                             .intValue(),
@@ -91,8 +91,8 @@ public class LootFunction implements Function<Void> {
                         LOGGER.error("Could not apply loot at {}", apply, e);
                         e.printStackTrace();
                     }
-                },
-                () -> LOGGER.error("No such loot table {}", id));
+                }
+            ).ifNothing(() -> LOGGER.error("No such loot table {}", id));
         return null;
     }
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java

@@ -91,10 +91,10 @@ public class StructureFunction implements Function<Boolean> {
                         FloatingPointFunctions.round(xz.getZ())),
                 arguments.getRandom(),
                 arguments.getRotation().rotate(rotation1));
-        }).orElseGet(() -> {
+        }).collect(left -> {
             LOGGER.error("No such structure {}", app);
             return false;
-        });
+        }, java.util.function.Function.identity());
     }
 
     @Override