refactor block state package

2026-04-18 14:20:02 +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/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;