reformat

2026-04-21 15:50:40 +00:00 · 2021-12-14 11:01:28 -07:00
parent bf5e7f589d
commit 58acca3078
147 changed files with 414 additions and 479 deletions
--- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java
@@ -7,12 +7,12 @@

 package com.dfsek.terra.api.config;

+import ca.solostudios.strata.version.VersionRange;
+
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;

-import ca.solostudios.strata.version.VersionRange;
-
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.meta.RegistryFactory;
@@ -21,11 +21,9 @@ import com.dfsek.terra.api.tectonic.LoaderHolder;
 import com.dfsek.terra.api.tectonic.LoaderRegistrar;
 import com.dfsek.terra.api.util.StringIdentifiable;
 import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 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.GenerationStageProvider;


 public interface ConfigPack extends LoaderRegistrar, LoaderHolder, RegistryHolder, StringIdentifiable {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java
@@ -7,14 +7,12 @@

 package com.dfsek.terra.api.handle;

-import com.dfsek.terra.api.block.entity.BlockEntity;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.util.vector.Vector3;
-
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;

+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.entity.EntityType;
+

 /**
 * Interface to be implemented for world manipulation.
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java
@@ -7,14 +7,14 @@

 package com.dfsek.terra.api.structure;

+import org.jetbrains.annotations.ApiStatus.Experimental;
+
 import java.util.List;
 import java.util.Random;

 import com.dfsek.terra.api.inventory.Inventory;
 import com.dfsek.terra.api.inventory.ItemStack;

-import org.jetbrains.annotations.ApiStatus.Experimental;
-

@Experimental
 public interface LootTable {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java
@@ -7,10 +7,10 @@

 package com.dfsek.terra.api.structure;

-import com.dfsek.terra.api.util.vector.Vector3;
-
 import org.jetbrains.annotations.ApiStatus.Experimental;

+import com.dfsek.terra.api.util.vector.Vector3;
+

@Experimental
 public interface StructureSpawn {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java
@@ -7,12 +7,12 @@

 package com.dfsek.terra.api.structure.buffer;

-import com.dfsek.terra.api.util.vector.Vector3;
-import com.dfsek.terra.api.world.chunk.Chunk;
-import com.dfsek.terra.api.world.ServerWorld;
-
 import org.jetbrains.annotations.ApiStatus.Experimental;

+import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.terra.api.world.ServerWorld;
+import com.dfsek.terra.api.world.chunk.Chunk;
+

@Experimental
 public interface Buffer {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java
@@ -7,12 +7,11 @@

 package com.dfsek.terra.api.structure.buffer;

-import com.dfsek.terra.api.util.vector.Vector3;
-
-import com.dfsek.terra.api.world.WritableWorld;
-
 import org.jetbrains.annotations.ApiStatus.Experimental;

+import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.terra.api.world.WritableWorld;
+

@Experimental
 public interface BufferedItem {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java
@@ -7,17 +7,17 @@

 package com.dfsek.terra.api.structure.buffer.buffers;

+import org.jetbrains.annotations.ApiStatus.Experimental;
+
 import java.util.LinkedHashMap;
 import java.util.Map;

 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.WritableWorld;
 import com.dfsek.terra.api.world.chunk.Chunk;
-import com.dfsek.terra.api.world.ServerWorld;
-
-import org.jetbrains.annotations.ApiStatus.Experimental;


 /**
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java
@@ -7,9 +7,8 @@

 package com.dfsek.terra.api.structure.buffer.buffers;

-import com.dfsek.terra.api.world.ServerWorld;
-
 import net.jafama.FastMath;
+import org.jetbrains.annotations.ApiStatus.Experimental;

 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -18,10 +17,9 @@ import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.structure.buffer.items.Cell;
 import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.chunk.Chunk;

-import org.jetbrains.annotations.ApiStatus.Experimental;
-

@Experimental
 public class StructureBuffer implements Buffer {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java
@@ -7,8 +7,6 @@

 package com.dfsek.terra.api.structure.buffer.items;

-import com.dfsek.terra.api.world.WritableWorld;
-
 import org.jetbrains.annotations.ApiStatus.Experimental;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +16,7 @@ import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.state.properties.base.Properties;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.terra.api.world.WritableWorld;


@Experimental
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java
@@ -7,16 +7,15 @@

 package com.dfsek.terra.api.structure.buffer.items;

+import org.jetbrains.annotations.ApiStatus.Experimental;
+
 import java.util.ArrayList;
 import java.util.List;

 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.util.vector.Vector3;
-
 import com.dfsek.terra.api.world.WritableWorld;

-import org.jetbrains.annotations.ApiStatus.Experimental;
-

@Experimental
 public class Cell implements BufferedItem {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java
@@ -7,14 +7,14 @@

 package com.dfsek.terra.api.structure.configured;

+import org.jetbrains.annotations.ApiStatus.Experimental;
+
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.StructureSpawn;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.StringIdentifiable;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

-import org.jetbrains.annotations.ApiStatus.Experimental;
-

@Experimental
 public interface ConfiguredStructure extends StringIdentifiable {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java
@@ -7,8 +7,8 @@

 package com.dfsek.terra.api.tectonic;

-import com.dfsek.tectonic.api.loader.type.TypeLoader;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.api.loader.type.TypeLoader;

 import java.lang.reflect.Type;
 import java.util.function.Supplier;
--- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java
@@ -7,12 +7,11 @@

 package com.dfsek.terra.api.world.chunk;

-import com.dfsek.terra.api.block.state.BlockState;
-
-import com.dfsek.terra.api.world.ServerWorld;
-
 import org.jetbrains.annotations.NotNull;

+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.world.ServerWorld;
+

 public interface Chunk extends ChunkAccess {
    void setBlock(int x, int y, int z, BlockState data, boolean physics);
--- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java
@@ -9,14 +9,11 @@ package com.dfsek.terra.api.world.chunk.generation;

 import org.jetbrains.annotations.NotNull;

-import java.util.List;
-
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.util.vector.integer.Vector3Int;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.WritableWorld;
-import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;


 public interface ChunkGenerator {
--- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java
@@ -13,6 +13,7 @@ public interface ProtoWorld extends WritableWorld {
     * Get the world object this ProtoWorld represents
     *
     * <b>Do not read from/write to this world!</b>
+     *
     * @return The world
     */
    ServerWorld getWorld();