mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2025-07-03 16:35:50 +00:00
Reformat code
This commit is contained in:
parent
59ea5a69d8
commit
1ab3233cba
@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
package com.dfsek.terra.addons.biome.image.v2;
|
package com.dfsek.terra.addons.biome.image.v2;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
|
import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
|
||||||
import com.dfsek.terra.addons.image.converter.ColorConverter;
|
import com.dfsek.terra.addons.image.converter.ColorConverter;
|
||||||
import com.dfsek.terra.api.world.biome.Biome;
|
import com.dfsek.terra.api.world.biome.Biome;
|
||||||
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
|
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
|
|
||||||
public class ImageBiomeProvider implements BiomeProvider {
|
public class ImageBiomeProvider implements BiomeProvider {
|
||||||
private final int resolution;
|
private final int resolution;
|
||||||
|
@ -8,21 +8,19 @@
|
|||||||
package com.dfsek.terra.addons.yaml;
|
package com.dfsek.terra.addons.yaml;
|
||||||
|
|
||||||
import com.dfsek.tectonic.yaml.YamlConfiguration;
|
import com.dfsek.tectonic.yaml.YamlConfiguration;
|
||||||
|
|
||||||
import com.dfsek.terra.api.util.FileUtil;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
|
||||||
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
|
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
|
||||||
import com.dfsek.terra.api.Platform;
|
import com.dfsek.terra.api.Platform;
|
||||||
import com.dfsek.terra.api.addon.BaseAddon;
|
import com.dfsek.terra.api.addon.BaseAddon;
|
||||||
import com.dfsek.terra.api.event.events.config.ConfigurationDiscoveryEvent;
|
import com.dfsek.terra.api.event.events.config.ConfigurationDiscoveryEvent;
|
||||||
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
|
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
|
||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
import com.dfsek.terra.api.inject.annotations.Inject;
|
||||||
|
import com.dfsek.terra.api.util.FileUtil;
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
|
|
||||||
|
|
||||||
public class YamlAddon implements AddonInitializer {
|
public class YamlAddon implements AddonInitializer {
|
||||||
|
@ -7,8 +7,6 @@
|
|||||||
|
|
||||||
package com.dfsek.terra.addons.sponge;
|
package com.dfsek.terra.addons.sponge;
|
||||||
|
|
||||||
import com.dfsek.terra.api.util.FileUtil;
|
|
||||||
|
|
||||||
import net.querz.nbt.io.NBTDeserializer;
|
import net.querz.nbt.io.NBTDeserializer;
|
||||||
import net.querz.nbt.tag.ByteArrayTag;
|
import net.querz.nbt.tag.ByteArrayTag;
|
||||||
import net.querz.nbt.tag.CompoundTag;
|
import net.querz.nbt.tag.CompoundTag;
|
||||||
@ -32,6 +30,7 @@ import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
|
|||||||
import com.dfsek.terra.api.inject.annotations.Inject;
|
import com.dfsek.terra.api.inject.annotations.Inject;
|
||||||
import com.dfsek.terra.api.registry.CheckedRegistry;
|
import com.dfsek.terra.api.registry.CheckedRegistry;
|
||||||
import com.dfsek.terra.api.structure.Structure;
|
import com.dfsek.terra.api.structure.Structure;
|
||||||
|
import com.dfsek.terra.api.util.FileUtil;
|
||||||
import com.dfsek.terra.api.util.vector.Vector3Int;
|
import com.dfsek.terra.api.util.vector.Vector3Int;
|
||||||
|
|
||||||
|
|
||||||
|
@ -7,6 +7,9 @@
|
|||||||
|
|
||||||
package com.dfsek.terra.addons.terrascript;
|
package com.dfsek.terra.addons.terrascript;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
|
||||||
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
|
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
|
||||||
import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
|
import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
|
||||||
import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
|
import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
|
||||||
@ -21,9 +24,6 @@ import com.dfsek.terra.api.structure.LootTable;
|
|||||||
import com.dfsek.terra.api.structure.Structure;
|
import com.dfsek.terra.api.structure.Structure;
|
||||||
import com.dfsek.terra.api.util.FileUtil;
|
import com.dfsek.terra.api.util.FileUtil;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
|
|
||||||
|
|
||||||
public class TerraScriptAddon implements AddonInitializer {
|
public class TerraScriptAddon implements AddonInitializer {
|
||||||
@Inject
|
@Inject
|
||||||
|
@ -9,7 +9,6 @@ package com.dfsek.terra.api.event.events.config;
|
|||||||
|
|
||||||
import com.dfsek.tectonic.api.config.Configuration;
|
import com.dfsek.tectonic.api.config.Configuration;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
|
|
||||||
import com.dfsek.terra.api.config.ConfigPack;
|
import com.dfsek.terra.api.config.ConfigPack;
|
||||||
|
@ -7,12 +7,12 @@
|
|||||||
|
|
||||||
package com.dfsek.terra.api.structure;
|
package com.dfsek.terra.api.structure;
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import com.dfsek.terra.api.util.Rotation;
|
import com.dfsek.terra.api.util.Rotation;
|
||||||
import com.dfsek.terra.api.util.vector.Vector3Int;
|
import com.dfsek.terra.api.util.vector.Vector3Int;
|
||||||
import com.dfsek.terra.api.world.WritableWorld;
|
import com.dfsek.terra.api.world.WritableWorld;
|
||||||
|
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
|
|
||||||
public interface Structure {
|
public interface Structure {
|
||||||
boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation);
|
boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation);
|
||||||
|
@ -5,19 +5,18 @@ import java.io.IOException;
|
|||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import static java.util.function.Function.*;
|
import static java.util.function.Function.identity;
|
||||||
|
|
||||||
|
|
||||||
public class FileUtil {
|
public class FileUtil {
|
||||||
public static Map<String, Path> filesWithExtension(Path start, String... extensions) throws IOException {
|
public static Map<String, Path> filesWithExtension(Path start, String... extensions) throws IOException {
|
||||||
if(Files.notExists(start) || !Files.isDirectory(start)) return Collections.emptyMap();
|
if(Files.notExists(start) || !Files.isDirectory(start)) return Collections.emptyMap();
|
||||||
try (Stream<Path> paths = Files.walk(start)) {
|
try(Stream<Path> paths = Files.walk(start)) {
|
||||||
return paths
|
return paths
|
||||||
.filter(Files::isRegularFile)
|
.filter(Files::isRegularFile)
|
||||||
.filter(p -> Arrays.stream(extensions).anyMatch(e -> p.getFileName().toString().endsWith(e)))
|
.filter(p -> Arrays.stream(extensions).anyMatch(e -> p.getFileName().toString().endsWith(e)))
|
||||||
|
@ -26,6 +26,31 @@ import com.dfsek.tectonic.api.loader.AbstractConfigLoader;
|
|||||||
import com.dfsek.tectonic.api.loader.ConfigLoader;
|
import com.dfsek.tectonic.api.loader.ConfigLoader;
|
||||||
import com.dfsek.tectonic.api.loader.type.TypeLoader;
|
import com.dfsek.tectonic.api.loader.type.TypeLoader;
|
||||||
import com.dfsek.tectonic.yaml.YamlConfiguration;
|
import com.dfsek.tectonic.yaml.YamlConfiguration;
|
||||||
|
import com.google.common.collect.ListMultimap;
|
||||||
|
import com.google.common.collect.Multimaps;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.lang.reflect.ParameterizedType;
|
||||||
|
import java.lang.reflect.Type;
|
||||||
|
import java.nio.file.FileSystem;
|
||||||
|
import java.nio.file.FileSystems;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
import com.dfsek.terra.api.Platform;
|
import com.dfsek.terra.api.Platform;
|
||||||
import com.dfsek.terra.api.addon.BaseAddon;
|
import com.dfsek.terra.api.addon.BaseAddon;
|
||||||
@ -52,30 +77,16 @@ import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
|
|||||||
import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider;
|
import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider;
|
||||||
import com.dfsek.terra.config.loaders.GenericTemplateSupplierLoader;
|
import com.dfsek.terra.config.loaders.GenericTemplateSupplierLoader;
|
||||||
import com.dfsek.terra.config.loaders.config.BufferedImageLoader;
|
import com.dfsek.terra.config.loaders.config.BufferedImageLoader;
|
||||||
import com.dfsek.terra.config.preprocessor.*;
|
import com.dfsek.terra.config.preprocessor.MetaListLikePreprocessor;
|
||||||
|
import com.dfsek.terra.config.preprocessor.MetaMapPreprocessor;
|
||||||
|
import com.dfsek.terra.config.preprocessor.MetaNumberPreprocessor;
|
||||||
|
import com.dfsek.terra.config.preprocessor.MetaStringPreprocessor;
|
||||||
|
import com.dfsek.terra.config.preprocessor.MetaValuePreprocessor;
|
||||||
import com.dfsek.terra.config.prototype.ProtoConfig;
|
import com.dfsek.terra.config.prototype.ProtoConfig;
|
||||||
import com.dfsek.terra.registry.CheckedRegistryImpl;
|
import com.dfsek.terra.registry.CheckedRegistryImpl;
|
||||||
import com.dfsek.terra.registry.OpenRegistryImpl;
|
import com.dfsek.terra.registry.OpenRegistryImpl;
|
||||||
import com.dfsek.terra.registry.ShortcutHolder;
|
import com.dfsek.terra.registry.ShortcutHolder;
|
||||||
|
|
||||||
import com.google.common.collect.ListMultimap;
|
|
||||||
import com.google.common.collect.Multimaps;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.io.*;
|
|
||||||
import java.lang.reflect.ParameterizedType;
|
|
||||||
import java.lang.reflect.Type;
|
|
||||||
import java.nio.file.FileSystem;
|
|
||||||
import java.nio.file.FileSystems;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a Terra configuration pack.
|
* Represents a Terra configuration pack.
|
||||||
@ -124,7 +135,8 @@ public class ConfigPackImpl implements ConfigPack {
|
|||||||
|
|
||||||
Path packManifestPath = rootPath.resolve("pack.yml");
|
Path packManifestPath = rootPath.resolve("pack.yml");
|
||||||
if(Files.notExists(packManifestPath)) throw new IOException("No pack.yml found in " + path);
|
if(Files.notExists(packManifestPath)) throw new IOException("No pack.yml found in " + path);
|
||||||
Configuration packManifest = new YamlConfiguration(Files.newInputStream(packManifestPath), packManifestPath.getFileName().toString());
|
Configuration packManifest = new YamlConfiguration(Files.newInputStream(packManifestPath),
|
||||||
|
packManifestPath.getFileName().toString());
|
||||||
|
|
||||||
this.platform = platform;
|
this.platform = platform;
|
||||||
this.configTypeRegistry = createConfigRegistry();
|
this.configTypeRegistry = createConfigRegistry();
|
||||||
|
@ -45,17 +45,17 @@ public class ConfigRegistry extends OpenRegistryImpl<ConfigPack> {
|
|||||||
Path packsDirectory = platform.getDataFolder().toPath().resolve("packs");
|
Path packsDirectory = platform.getDataFolder().toPath().resolve("packs");
|
||||||
Files.createDirectories(packsDirectory);
|
Files.createDirectories(packsDirectory);
|
||||||
List<IOException> failedLoads = new ArrayList<>();
|
List<IOException> failedLoads = new ArrayList<>();
|
||||||
try (Stream<Path> packs = Files.list(packsDirectory)) {
|
try(Stream<Path> packs = Files.list(packsDirectory)) {
|
||||||
packs.forEach(path -> {
|
packs.forEach(path -> {
|
||||||
try {
|
try {
|
||||||
ConfigPack pack = new ConfigPackImpl(path, platform);
|
ConfigPack pack = new ConfigPackImpl(path, platform);
|
||||||
registerChecked(pack.getRegistryKey(), pack);
|
registerChecked(pack.getRegistryKey(), pack);
|
||||||
} catch (IOException e) {
|
} catch(IOException e) {
|
||||||
failedLoads.add(e);
|
failedLoads.add(e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (!failedLoads.isEmpty()) {
|
if(!failedLoads.isEmpty()) {
|
||||||
throw new PackLoadFailuresException(failedLoads);
|
throw new PackLoadFailuresException(failedLoads);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user