imports

2026-04-09 17:26:07 +00:00 · 2021-06-25 13:33:43 -07:00
parent 56029851f0
commit 966e1eb2a6
39 changed files with 10 additions and 55 deletions
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java
@@ -9,7 +9,6 @@ import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.vector.Vector2Impl;
 import com.dfsek.terra.vector.Vector3Impl;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java
@@ -34,7 +34,7 @@ public class CheckBlockFunction implements Function<String> {

        RotationUtil.rotateVector(xz, arguments.getRotation());

-        String data  = arguments.getWorld().getBlockData(arguments.getBuffer().getOrigin().clone().add(new Vector3Impl(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ())))).getAsString();
+        String data = arguments.getWorld().getBlockData(arguments.getBuffer().getOrigin().clone().add(new Vector3Impl(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ())))).getAsString();
        if(data.contains("[")) return data.substring(0, data.indexOf('[')); // Strip properties
        else return data;
    }
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java
@@ -8,7 +8,6 @@ import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.TerraWorld;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java
@@ -2,7 +2,6 @@ package com.dfsek.terra.api.structures.structure.buffer;

 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.util.GlueList;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;

--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java
@@ -2,7 +2,6 @@ package com.dfsek.terra.api.structures.structure.buffer;

 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java
@@ -2,7 +2,6 @@ package com.dfsek.terra.api.structures.structure.buffer;

 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java
@@ -2,7 +2,6 @@ package com.dfsek.terra.api.structures.structure.buffer;

 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java
@@ -5,7 +5,6 @@ import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;

--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java
@@ -8,7 +8,6 @@ import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.util.FastRandom;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;

--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java
@@ -2,7 +2,6 @@ package com.dfsek.terra.api.structures.structure.buffer.items;

 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;

--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java
@@ -3,7 +3,6 @@ package com.dfsek.terra.api.structures.structure.buffer.items;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;

--- a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncBiomeFinder.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncBiomeFinder.java
@@ -1,7 +1,6 @@
 package com.dfsek.terra.api.world.locate;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.TerraBiome;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncFeatureFinder.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncFeatureFinder.java
@@ -1,7 +1,6 @@
 package com.dfsek.terra.api.world.locate;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java
@@ -4,7 +4,6 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.PopulationUtil;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java
@@ -17,7 +17,6 @@ import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.vector.Vector3Impl;

 import java.util.HashMap;
--- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureExportCommand.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureExportCommand.java
@@ -15,9 +15,7 @@ import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.util.generic.pair.Pair;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.vector.LocationImpl;

 import java.io.BufferedWriter;
 import java.io.File;
--- a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java
@@ -53,7 +53,6 @@ import com.dfsek.terra.noise.samplers.ImageSampler;
 import com.dfsek.terra.noise.samplers.noise.CellularSampler;
 import com.dfsek.terra.world.population.items.flora.FloraLayer;
 import com.dfsek.terra.world.population.items.flora.TerraFlora;
-import com.dfsek.terra.world.population.items.ores.Ore;
 import com.dfsek.terra.world.population.items.ores.OreConfig;
 import com.dfsek.terra.world.population.items.ores.OreHolder;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;
--- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
@@ -7,7 +7,6 @@ import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collections.MaterialSet;
-import com.dfsek.terra.world.population.items.ores.Ore;

 import java.util.HashMap;
 import java.util.Map;
--- a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java
@@ -3,8 +3,8 @@ package com.dfsek.terra.registry;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.api.registry.OpenRegistry;
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;

 import java.lang.reflect.Type;
 import java.util.Collection;
--- a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java
@@ -2,8 +2,8 @@ package com.dfsek.terra.registry;

 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.api.registry.OpenRegistry;
+import com.dfsek.terra.api.registry.exception.DuplicateEntryException;

 import java.lang.reflect.Type;
 import java.util.Collection;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java
@@ -6,7 +6,6 @@ import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.PopulationUtil;
-import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.TerraWorld;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java
@@ -87,10 +87,10 @@ public class TerraFlora implements Flora {

    private boolean isIrrigated(Vector3 b, World world) {
        if(irrigable == null) return true;
-        return irrigable.contains(world.getBlockData(b.getBlockX()+1, b.getBlockY(), b.getBlockZ()).getBlockType())
-                || irrigable.contains(world.getBlockData(b.getBlockX()-1, b.getBlockY(), b.getBlockZ()).getBlockType())
-                || irrigable.contains(world.getBlockData(b.getBlockX(), b.getBlockY(), b.getBlockZ()+1).getBlockType())
-                || irrigable.contains(world.getBlockData(b.getBlockX(), b.getBlockY(), b.getBlockZ()-1).getBlockType());
+        return irrigable.contains(world.getBlockData(b.getBlockX() + 1, b.getBlockY(), b.getBlockZ()).getBlockType())
+                || irrigable.contains(world.getBlockData(b.getBlockX() - 1, b.getBlockY(), b.getBlockZ()).getBlockType())
+                || irrigable.contains(world.getBlockData(b.getBlockX(), b.getBlockY(), b.getBlockZ() + 1).getBlockType())
+                || irrigable.contains(world.getBlockData(b.getBlockX(), b.getBlockY(), b.getBlockZ() - 1).getBlockType());
    }


@@ -133,7 +133,8 @@ public class TerraFlora implements Flora {
    }

    private void test(List<BlockFace> faces, BlockFace f, Vector3 b, World world) {
-        if(testRotation.contains(world.getBlockData(b.getBlockX()+f.getModX(), b.getBlockY()+f.getModY(), b.getBlockZ()+f.getModZ()).getBlockType())) faces.add(f);
+        if(testRotation.contains(world.getBlockData(b.getBlockX() + f.getModX(), b.getBlockY() + f.getModY(), b.getBlockZ() + f.getModZ()).getBlockType()))
+            faces.add(f);
    }

    public enum Search {
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java
@@ -23,7 +23,7 @@ public class TreeLayer extends PlaceableLayer<Tree> {
        Tree item = layer.get(noise, coords.getX() + cx, coords.getZ() + cz);
        Vector3 running = coords.extrude(level.getMax());
        for(int ignored : level) {
-            running.subtract(0,1,0);
+            running.subtract(0, 1, 0);
            if(item.getSpawnable().contains(chunk.getBlock(running.getBlockX(), running.getBlockY(), running.getBlockZ()).getBlockType())) {
                item.plant(running.clone().add(cx, 1, cz), chunk.getWorld(), PopulationUtil.getRandom(chunk, coords.hashCode()));
            }