refactor block state package

2026-04-04 23:06:05 +00:00 · 2021-06-25 20:51:38 -07:00
parent 4ecb08619f
commit 43307b737c
86 changed files with 102 additions and 100 deletions
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.structures.script.functions;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BlockFunction.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BlockFunction.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.structures.script.functions;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/DynamicBlockFunction.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/DynamicBlockFunction.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.structures.script.functions;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.structures.script.functions;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.data.Waterlogged;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Vector3;
--- 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
@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;

-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.util;

-import com.dfsek.terra.api.block.data.properties.enums.RailShape;
-import com.dfsek.terra.api.block.data.properties.enums.Axis;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.properties.enums.RailShape;
+import com.dfsek.terra.api.block.state.properties.enums.Axis;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockFace;
 import com.dfsek.terra.api.block.data.Directional;
 import com.dfsek.terra.api.block.data.MultipleFacing;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/util/collections/MaterialSet.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/util/collections/MaterialSet.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.util.collections;

-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;

 import java.util.Arrays;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.palette;

-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.noise.NoiseSampler;

 import java.util.List;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.palette;

-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.ProbabilityCollection;
--- a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.palette.holder;

-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
 import org.jetbrains.annotations.NotNull;
--- a/common/implementation/src/main/java/com/dfsek/terra/carving/CarverPalette.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/carving/CarverPalette.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.carving;

-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.util.collections.MaterialSet;
--- 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
@@ -1,7 +1,7 @@
 package com.dfsek.terra.commands.structure;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.entity.Sign;
 import com.dfsek.terra.api.command.CommandTemplate;
--- a/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.config.dummy;

-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
--- a/common/implementation/src/main/java/com/dfsek/terra/config/factories/OreFactory.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/factories/OreFactory.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.config.factories;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.config.templates.OreTemplate;
 import com.dfsek.terra.world.population.items.ores.Ore;
 import com.dfsek.terra.world.population.items.ores.VanillaOre;
--- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.config.loaders;

-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.api.world.Tree;
--- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java
@@ -4,7 +4,7 @@ import com.dfsek.tectonic.config.Configuration;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.carving.CarverPalette;
--- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java
@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.palette;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
--- 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
@@ -3,7 +3,7 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collections.MaterialSet;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorldImpl.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorldImpl.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.world;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.world.TerraWorldLoadEvent;
 import com.dfsek.terra.api.vector.Vector3;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.carving;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.ChunkAccess;
 import com.dfsek.terra.api.world.World;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.generation.generators;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.api.util.PaletteUtil;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.generation.generators;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockFace;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.data.Bisected;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.population;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.config.WorldConfig;
 import com.dfsek.terra.api.handle.WorldHandle;
--- 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
@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.population.items.flora;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockFace;
 import com.dfsek.terra.api.block.data.Directional;
 import com.dfsek.terra.api.block.data.MultipleFacing;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.population.items.ores;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.Chunk;
--- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java
+++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.population.items.ores;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collections.MaterialSet;