implement Bifunctor Pair

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/sampler/CacheSampler.java

@@ -8,8 +8,8 @@ import org.jetbrains.annotations.ApiStatus.Experimental;
 
 import com.dfsek.terra.api.util.cache.DoubleSeededVector2Key;
 import com.dfsek.terra.api.util.cache.DoubleSeededVector3Key;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
-import com.dfsek.terra.api.util.generic.pair.Pair.Mutable;
+import com.dfsek.terra.api.util.generic.data.types.Pair.Mutable;
 
 import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java

@@ -61,7 +61,7 @@ import com.dfsek.terra.addons.terrascript.parser.lang.variables.reference.StrVar
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.addons.terrascript.tokenizer.Token;
 import com.dfsek.terra.addons.terrascript.tokenizer.Tokenizer;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 
 
 @SuppressWarnings("unchecked")

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Scope.java

@@ -5,7 +5,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable.ReturnType;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 
 
 public class Scope {

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java

@@ -17,7 +17,7 @@ import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.Scope;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 
 
 public class IfKeyword implements Keyword<Block.ReturnInfo<?>> {

common/api/src/main/java/com/dfsek/terra/api/util/generic/data/types/Pair.java

@@ -5,7 +5,9 @@
  * reference the LICENSE file in the common/api directory.
  */
 
-package com.dfsek.terra.api.util.generic.pair;
+package com.dfsek.terra.api.util.generic.data.types;
+
+import com.dfsek.terra.api.util.generic.data.BiFunctor;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -17,15 +19,15 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 
 
-public record Pair<L, R>(L left, R right) implements Bifunctor{
+public record Pair<L, R>(L left, R right) implements BiFunctor<L, R, Pair<?, ?>> {
     private static final Pair<?, ?> NULL = new Pair<>(null, null);
 
-    public static <L, R, T> Function<Pair<L, R>, Pair<T, R>> mapLeft(Function<L, T> function) {
+    public <T> Pair<T, R> mapLeft(Function<L, T> function) {
-        return pair -> of(function.apply(pair.left), pair.right);
+        return of(function.apply(left), right);
     }
 
-    public static <L, R, T> Function<Pair<L, R>, Pair<L, T>> mapRight(Function<R, T> function) {
+    public <T> Pair<L, T> mapRight(Function<R, T> function) {
-        return pair -> of(pair.left, function.apply(pair.right));
+        return of(left, function.apply(right));
     }
 
     public static <L> Predicate<Pair<L, ?>> testLeft(Predicate<L> predicate) {

common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java

@@ -6,13 +6,11 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.github.benmanes.caffeine.cache.Scheduler;
 
-import java.util.Optional;
-
 import com.dfsek.terra.api.Handle;
 import com.dfsek.terra.api.util.cache.SeededVector2Key;
 import com.dfsek.terra.api.util.cache.SeededVector3Key;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
-import com.dfsek.terra.api.util.generic.pair.Pair.Mutable;
+import com.dfsek.terra.api.util.generic.data.types.Pair.Mutable;
 import com.dfsek.terra.api.world.biome.Biome;
 
 import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR;

common/api/src/test/java/util/ColumnTest.java

@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import com.dfsek.terra.api.util.Column;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 import com.dfsek.terra.api.util.mutable.MutableInteger;
 
 import static org.junit.jupiter.api.Assertions.*;

common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java

@@ -64,7 +64,7 @@ import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 import com.dfsek.terra.api.util.mutable.MutableBoolean;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.config.GenericLoaders;
@@ -308,7 +308,7 @@ public abstract class AbstractPlatform implements Platform {
                 .walk(addonsPath)
                 .map(path -> Pair.of(path, data.relativize(path).toString()))
 
-                .map(Pair.mapRight(s -> {
+                .map(p -> p.mapRight(s -> {
                     if(s.contains("+")) { // remove commit hash
                         return s.substring(0, s.lastIndexOf('+'));
                     }
@@ -316,17 +316,17 @@ public abstract class AbstractPlatform implements Platform {
                 }))
 
                 .filter(Pair.testRight(s -> s.contains("."))) // remove patch version
-                .map(Pair.mapRight(s -> s.substring(0, s.lastIndexOf('.'))))
+                .map(p -> p.mapRight(s -> s.substring(0, s.lastIndexOf('.'))))
 
                 .filter(Pair.testRight(s -> s.contains("."))) // remove minor version
-                .map(Pair.mapRight(s -> s.substring(0, s.lastIndexOf('.'))))
+                .map(p -> p.mapRight(s -> s.substring(0, s.lastIndexOf('.'))))
 
                 .collect(Collectors.toSet());
 
             Set<String> pathsNoMajor = paths
                 .stream()
                 .filter(Pair.testRight(s -> s.contains(".")))
-                .map(Pair.mapRight(s -> s.substring(0, s.lastIndexOf('.')))) // remove major version
+                .map(p -> p.mapRight(s -> s.substring(0, s.lastIndexOf('.')))) // remove major version
                 .map(Pair.unwrapRight())
                 .collect(Collectors.toSet());
 

common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java

@@ -71,7 +71,7 @@ import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.tectonic.ShortcutLoader;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 import com.dfsek.terra.api.util.reflection.ReflectionUtil;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java

@@ -34,7 +34,7 @@ import java.util.Optional;
 import java.util.Set;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 
 
 public class MetaListLikePreprocessor extends MetaPreprocessor<Meta> {

common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java

@@ -33,7 +33,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
 

common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaPreprocessor.java

@@ -25,7 +25,7 @@ import com.dfsek.tectonic.api.preprocessor.ValuePreprocessor;
 import java.lang.annotation.Annotation;
 import java.util.Map;
 
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 
 
 public abstract class MetaPreprocessor<A extends Annotation> implements ValuePreprocessor<A> {

common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaValuePreprocessor.java

@@ -27,7 +27,7 @@ import java.lang.reflect.AnnotatedType;
 import java.util.Map;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 
 
 public class MetaValuePreprocessor extends MetaPreprocessor<Meta> {

common/implementation/base/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java

@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.api.registry.key.RegistryKey;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
 

platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java

@@ -23,7 +23,7 @@ import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;

platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/GeneratedChunkCache.java

@@ -8,7 +8,6 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java

@@ -27,7 +27,7 @@ import java.util.Locale;
 
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.MetaPack;
-import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.data.types.Pair;
 import com.dfsek.terra.api.util.range.ConstantRange;
 import com.dfsek.terra.mod.ModPlatform;
 import com.dfsek.terra.mod.config.VanillaWorldProperties;