mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 16:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor block state package

Browse Source
This commit is contained in:
dfsek 2021-06-25 20:51:38 -07:00
parent 4ecb08619f
commit 43307b737c
86 changed files with 102 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java
View File

@ -1,6 +1,7 @@
package com.dfsek.terra.api.block;
import com.dfsek.terra.api.Handle;
import com.dfsek.terra.api.block.state.BlockState;
public interface BlockType extends Handle {
BlockState getDefaultData();

2
common/api/src/main/java/com/dfsek/terra/api/block/data/AnaloguePowerable.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
public interface AnaloguePowerable extends BlockState {
int getMaximumPower();

2
common/api/src/main/java/com/dfsek/terra/api/block/data/Bisected.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
public interface Bisected extends BlockState {
Half getHalf();

2
common/api/src/main/java/com/dfsek/terra/api/block/data/Directional.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.BlockFace;
public interface Directional extends BlockState {

2
common/api/src/main/java/com/dfsek/terra/api/block/data/MultipleFacing.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.BlockFace;
import java.util.Set;

4
common/api/src/main/java/com/dfsek/terra/api/block/data/Orientable.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.api.block.data;
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.Axis;
import com.dfsek.terra.api.block.state.BlockState;
import java.util.Set;

4
common/api/src/main/java/com/dfsek/terra/api/block/data/Rail.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.data.properties.enums.RailShape;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.state.properties.enums.RailShape;
public interface Rail extends BlockState {
RailShape getShape();

2
common/api/src/main/java/com/dfsek/terra/api/block/data/RedstoneWire.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.BlockFace;
import java.util.Set;

2
common/api/src/main/java/com/dfsek/terra/api/block/data/Rotatable.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.BlockFace;
public interface Rotatable extends BlockState {

2
common/api/src/main/java/com/dfsek/terra/api/block/data/Wall.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.BlockFace;
public interface Wall extends BlockState, Waterlogged {

2
common/api/src/main/java/com/dfsek/terra/api/block/data/Waterlogged.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
public interface Waterlogged extends BlockState {
boolean isWaterlogged();

5
common/api/src/main/java/com/dfsek/terra/api/block/data/properties/enums/Axis.java
View File

@ -1,5 +0,0 @@
package com.dfsek.terra.api.block.data.properties.enums;
public enum Axis {
X, Y, Z
}

2
common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.api.block.entity;
import com.dfsek.terra.api.Handle;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.vector.Vector3;
public interface BlockEntity extends Handle {

5
common/api/src/main/java/com/dfsek/terra/api/block/BlockState.java → common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java
View File

@ -1,7 +1,8 @@
package com.dfsek.terra.api.block;
package com.dfsek.terra.api.block.state;
import com.dfsek.terra.api.Handle;
import com.dfsek.terra.api.block.data.properties.Property;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.block.state.properties.Property;
public interface BlockState extends Cloneable, Handle {

2
common/api/src/main/java/com/dfsek/terra/api/block/data/properties/Property.java → common/api/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.api.block.data.properties;
package com.dfsek.terra.api.block.state.properties;
import java.util.Collection;

4
common/api/src/main/java/com/dfsek/terra/api/block/data/properties/base/BooleanProperty.java → common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data.properties.base;
package com.dfsek.terra.api.block.state.properties.base;
import com.dfsek.terra.api.block.data.properties.Property;
import com.dfsek.terra.api.block.state.properties.Property;
import java.util.Arrays;
import java.util.Collection;

4
common/api/src/main/java/com/dfsek/terra/api/block/data/properties/base/EnumProperty.java → common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data.properties.base;
package com.dfsek.terra.api.block.state.properties.base;
import com.dfsek.terra.api.block.data.properties.Property;
import com.dfsek.terra.api.block.state.properties.Property;
import com.dfsek.terra.api.util.generic.Lazy;
import java.util.Arrays;

4
common/api/src/main/java/com/dfsek/terra/api/block/data/properties/base/IntProperty.java → common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.block.data.properties.base;
package com.dfsek.terra.api.block.state.properties.base;
import com.dfsek.terra.api.block.data.properties.Property;
import com.dfsek.terra.api.block.state.properties.Property;
import com.dfsek.terra.api.util.generic.Construct;
import java.util.ArrayList;

6
common/api/src/main/java/com/dfsek/terra/api/block/data/properties/base/Properties.java → common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.api.block.data.properties.base;
package com.dfsek.terra.api.block.state.properties.base;
import com.dfsek.terra.api.block.data.properties.enums.Direction;
import com.dfsek.terra.api.block.data.properties.enums.RailShape;
import com.dfsek.terra.api.block.state.properties.enums.Direction;
import com.dfsek.terra.api.block.state.properties.enums.RailShape;
public final class Properties {
public static final EnumProperty<Direction> DIRECTION = EnumProperty.of("facing", Direction.class);

5
common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java Normal file
View File

@ -0,0 +1,5 @@
package com.dfsek.terra.api.block.state.properties.enums;
public enum Axis {
X, Y, Z
}

2
common/api/src/main/java/com/dfsek/terra/api/block/data/properties/enums/Direction.java → common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.api.block.data.properties.enums;
package com.dfsek.terra.api.block.state.properties.enums;
public enum Direction {
NORTH,SOUTH,EAST,WEST,UP,DOWN

2
common/api/src/main/java/com/dfsek/terra/api/block/data/properties/enums/RailShape.java → common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.api.block.data.properties.enums;
package com.dfsek.terra.api.block.state.properties.enums;
public enum RailShape {
ASCENDING_EAST,

2
common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.handle;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.util.generic.pair.Pair;

2
common/api/src/main/java/com/dfsek/terra/api/world/Chunk.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.world;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
public interface Chunk extends ChunkAccess {
int getX();

2
common/api/src/main/java/com/dfsek/terra/api/world/ChunkAccess.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.api.world;
import com.dfsek.terra.api.Handle;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import org.jetbrains.annotations.NotNull;
public interface ChunkAccess extends Handle {

2
common/api/src/main/java/com/dfsek/terra/api/world/TerraWorld.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.world;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.config.WorldConfig;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

2
common/api/src/main/java/com/dfsek/terra/api/world/World.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.api.world;
import com.dfsek.terra.api.Handle;
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;

2
common/api/src/main/java/com/dfsek/terra/api/world/generator/Palette.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.world.generator;
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;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BlockFunction.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/DynamicBlockFunction.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java
View File

@ -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;

6
common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/util/collections/MaterialSet.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/carving/CarverPalette.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureExportCommand.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/config/factories/OreFactory.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/world/TerraWorldImpl.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java
View File

@ -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;

2
common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java
View File

@ -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;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
View File

@ -8,7 +8,7 @@ import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.addon.annotations.Addon;
import com.dfsek.terra.api.addon.annotations.Author;
import com.dfsek.terra.api.addon.annotations.Version;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.command.CommandManager;
import com.dfsek.terra.api.command.TerraCommandManager;
import com.dfsek.terra.api.command.exception.MalformedCommandException;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.generator;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.world.generator.ChunkData;
import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
import org.bukkit.generator.ChunkGenerator;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.handles;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.handle.WorldHandle;

6
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
View File

@ -1,9 +1,9 @@
package com.dfsek.terra.bukkit.world;
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.BlockType;
import com.dfsek.terra.api.block.data.Bisected;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World;
import org.jetbrains.annotations.NotNull;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world;
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;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world.block;
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.inventory.Item;
import com.dfsek.terra.api.inventory.ItemStack;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world.block.data;
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.bukkit.TerraBukkitPlugin;
import com.dfsek.terra.bukkit.world.BukkitAdapter;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitOrientable.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world.block.data;
import com.dfsek.terra.api.block.data.properties.enums.Axis;
import com.dfsek.terra.api.block.state.properties.enums.Axis;
import com.dfsek.terra.api.block.data.Orientable;
import com.dfsek.terra.bukkit.world.BukkitAdapter;

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitRail.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block.data;
import com.dfsek.terra.api.block.data.Rail;
import com.dfsek.terra.api.block.data.properties.enums.RailShape;
import com.dfsek.terra.api.block.state.properties.enums.RailShape;
import com.dfsek.terra.bukkit.world.BukkitAdapter;
public class BukkitRail extends BukkitBlockState implements Rail {

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world.block.state;
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.vector.Vector3;
import com.dfsek.terra.bukkit.world.BukkitAdapter;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
View File

@ -9,7 +9,7 @@ import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.addon.annotations.Addon;
import com.dfsek.terra.api.addon.annotations.Author;
import com.dfsek.terra.api.addon.annotations.Version;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.command.CommandManager;
import com.dfsek.terra.api.command.TerraCommandManager;
import com.dfsek.terra.api.command.exception.MalformedCommandException;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.block;
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.fabric.mixin.access.StateAccessor;
import net.minecraft.block.Blocks;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/data/FabricOrientable.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.block.data;
import com.dfsek.terra.api.block.data.properties.enums.Axis;
import com.dfsek.terra.api.block.state.properties.enums.Axis;
import com.dfsek.terra.api.block.data.Orientable;
import com.dfsek.terra.fabric.block.FabricBlockState;
import com.dfsek.terra.fabric.util.FabricAdapter;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockEntityMixin.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.implementations.block;
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.fabric.util.FabricAdapter;
import net.minecraft.util.math.BlockPos;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockMixin.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.implementations.block;
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.fabric.util.FabricAdapter;
import net.minecraft.block.Block;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.implementations.chunk;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.fabric.block.FabricBlockState;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.implementations.chunk;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.fabric.block.FabricBlockState;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.implementations.chunk.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.world.generator.ChunkData;
import com.dfsek.terra.fabric.block.FabricBlockState;
import net.minecraft.util.math.BlockPos;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.implementations.world;
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;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.implementations.world;
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;

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.util;
import com.dfsek.terra.api.block.data.properties.enums.Axis;
import com.dfsek.terra.api.block.state.properties.enums.Axis;
import com.dfsek.terra.api.block.BlockFace;
import com.dfsek.terra.api.block.data.Bisected;
import com.dfsek.terra.api.block.data.Slab;

2
platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
View File

@ -3,7 +3,7 @@ package com.dfsek.terra;
import com.dfsek.tectonic.loading.TypeRegistry;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.addon.TerraAddon;
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.config.PluginConfig;
import com.dfsek.terra.api.event.EventManager;

2
platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlockEntity.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.platform;
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.vector.Vector3;

2
platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.platform;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.generator.ChunkData;
import net.querz.mca.Chunk;

2
platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.platform;
import com.dfsek.terra.DirectUtils;
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;

2
platforms/region/src/main/java/com/dfsek/terra/platform/RawWorldHandle.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.platform;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.handle.WorldHandle;

2
platforms/region/src/main/java/com/dfsek/terra/platform/State.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.platform;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.BlockType;
import net.querz.nbt.tag.CompoundTag;

2
platforms/sponge/src/main/java/com/dfsek/terra/sponge/SpongeAdapter.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.sponge;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.sponge.world.block.data.SpongeBlockState;
public final class SpongeAdapter {

2
platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/SpongeWorldHandle.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.sponge.world;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.sponge.SpongeAdapter;

2
platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/block/data/SpongeBlockState.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.sponge.world.block.data;
import com.dfsek.terra.api.block.BlockState;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.BlockType;
public class SpongeBlockState implements BlockState {