diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java b/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java index 59cec4008..03c7f5f0d 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java @@ -1,20 +1,19 @@ package com.dfsek.terra.api.config; -import com.dfsek.tectonic.config.Configuration; import com.dfsek.tectonic.exception.ConfigException; -import com.dfsek.terra.api.util.function.ExceptionalConsumer; import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; public interface Loader { - Loader thenNames(ExceptionalConsumer> consumer) throws ConfigException; + Loader thenNames(Consumer> consumer) throws ConfigException; - Loader thenEntries(ExceptionalConsumer>> consumer) throws ConfigException; + Loader thenEntries(Consumer>> consumer) throws ConfigException; /** * Get a single file from this Loader. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/function/ExceptionalConsumer.java b/common/api/src/main/java/com/dfsek/terra/api/util/function/ExceptionalConsumer.java deleted file mode 100644 index 2bdd3c06e..000000000 --- a/common/api/src/main/java/com/dfsek/terra/api/util/function/ExceptionalConsumer.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.dfsek.terra.api.util.function; - -import com.dfsek.tectonic.exception.ConfigException; - -@FunctionalInterface -public interface ExceptionalConsumer { - void accept(T t) throws ConfigException; -} diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java index 8f1c17fa2..839cdf325 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java @@ -2,7 +2,6 @@ package com.dfsek.terra.config.fileloaders; import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.terra.api.config.Loader; -import com.dfsek.terra.api.util.function.ExceptionalConsumer; import java.io.IOException; import java.io.InputStream; @@ -11,18 +10,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; public abstract class LoaderImpl implements Loader { protected final Map streams = new HashMap<>(); @Override - public Loader thenNames(ExceptionalConsumer> consumer) throws ConfigException { + public Loader thenNames(Consumer> consumer) throws ConfigException { consumer.accept(new ArrayList<>(streams.keySet())); return this; } @Override - public Loader thenEntries(ExceptionalConsumer>> consumer) throws ConfigException { + public Loader thenEntries(Consumer>> consumer) throws ConfigException { consumer.accept(streams.entrySet()); return this; }