refactor block state package

2026-04-13 19:26:14 +00:00 · 2021-06-25 20:51:38 -07:00
parent 4ecb08619f
commit 43307b737c
86 changed files with 102 additions and 100 deletions
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -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;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
@@ -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;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java
@@ -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;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
@@ -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;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java
@@ -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;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java
@@ -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;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java
@@ -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;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java
@@ -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;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitOrientable.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitOrientable.java
@@ -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;

--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitRail.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitRail.java
@@ -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 {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/data/FabricOrientable.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/data/FabricOrientable.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockEntityMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockEntityMixin.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockMixin.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java
@@ -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;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java
@@ -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;
--- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
@@ -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;
--- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlockEntity.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlockEntity.java
@@ -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;

--- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java
@@ -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;
--- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java
@@ -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;
--- a/platforms/region/src/main/java/com/dfsek/terra/platform/RawWorldHandle.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/RawWorldHandle.java
@@ -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;

--- a/platforms/region/src/main/java/com/dfsek/terra/platform/State.java
+++ b/platforms/region/src/main/java/com/dfsek/terra/platform/State.java
@@ -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;

--- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/SpongeAdapter.java
+++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/SpongeAdapter.java
@@ -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 {
--- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/SpongeWorldHandle.java
+++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/SpongeWorldHandle.java
@@ -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;
--- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/block/data/SpongeBlockState.java
+++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/world/block/data/SpongeBlockState.java
@@ -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 {