diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockEntity.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java similarity index 90% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/BlockEntity.java rename to common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java index dfbd43f52..85d48b597 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockEntity.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.block.state; +package com.dfsek.terra.api.block.entity; import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.block.BlockState; diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/Container.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java similarity index 76% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/Container.java rename to common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java index feda2d88f..07529b1e9 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/Container.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.block.state; +package com.dfsek.terra.api.block.entity; import com.dfsek.terra.api.inventory.BlockInventoryHolder; diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/MobSpawner.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java similarity index 94% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/MobSpawner.java rename to common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java index e40889d4b..c9133ef46 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/MobSpawner.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.block.state; +package com.dfsek.terra.api.block.entity; import com.dfsek.terra.api.entity.EntityType; import org.jetbrains.annotations.NotNull; diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/SerialState.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java similarity index 98% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/SerialState.java rename to common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java index 22c39ee44..97d19c2a3 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/SerialState.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.block.state; +package com.dfsek.terra.api.block.entity; import java.util.HashMap; import java.util.Map; diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/Sign.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java similarity index 87% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/Sign.java rename to common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java index 4f6d1d71f..8c1a4bfe6 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/Sign.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.block.state; +package com.dfsek.terra.api.block.entity; import org.jetbrains.annotations.NotNull; diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java index 9815c6add..3b2641cbc 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.event.events.world.generation; -import com.dfsek.terra.api.block.state.Container; +import com.dfsek.terra.api.block.entity.Container; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.event.events.AbstractCancellable; import com.dfsek.terra.api.event.events.Cancellable; diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/World.java b/common/api/src/main/java/com/dfsek/terra/api/world/World.java index 3b70f5eb5..9d877bdf1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/World.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/World.java @@ -2,7 +2,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.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.vector.Vector3; diff --git 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 index 3ec922301..4e85a9416 100644 --- 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 @@ -1,8 +1,8 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.block.state.BlockEntity; -import com.dfsek.terra.api.block.state.Container; +import com.dfsek.terra.api.block.entity.BlockEntity; +import com.dfsek.terra.api.block.entity.Container; import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.buffer.BufferedItem; diff --git 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 index addf523d1..637885ff7 100644 --- 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 @@ -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.state.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git 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 index 29a4398df..8064351a0 100644 --- 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 @@ -2,8 +2,8 @@ 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.BlockEntity; -import com.dfsek.terra.api.block.state.Sign; +import com.dfsek.terra.api.block.entity.BlockEntity; +import com.dfsek.terra.api.block.entity.Sign; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Argument; import com.dfsek.terra.api.command.annotation.Command; diff --git 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 index fdb01867a..3cefd1deb 100644 --- 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,7 +1,7 @@ package com.dfsek.terra.config.dummy; import com.dfsek.terra.api.block.BlockState; -import com.dfsek.terra.api.block.state.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.vector.Vector3; diff --git 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 index d01449852..8ff2e6c9f 100644 --- 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,7 +1,7 @@ package com.dfsek.terra.bukkit.world; import com.dfsek.terra.api.block.BlockState; -import com.dfsek.terra.api.block.state.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.vector.Vector3; diff --git 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 index 5d668772f..511a70a43 100644 --- 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,7 +1,7 @@ package com.dfsek.terra.bukkit.world.block.state; import com.dfsek.terra.api.block.BlockState; -import com.dfsek.terra.api.block.state.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitContainer.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitContainer.java index fe4728bb8..834afa7ce 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitContainer.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitContainer.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.world.block.state; -import com.dfsek.terra.api.block.state.Container; +import com.dfsek.terra.api.block.entity.Container; import com.dfsek.terra.api.inventory.Inventory; import com.dfsek.terra.bukkit.world.inventory.BukkitInventory; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitMobSpawner.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitMobSpawner.java index af5a5b992..853a459ad 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitMobSpawner.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitMobSpawner.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.world.block.state; -import com.dfsek.terra.api.block.state.MobSpawner; -import com.dfsek.terra.api.block.state.SerialState; +import com.dfsek.terra.api.block.entity.MobSpawner; +import com.dfsek.terra.api.block.entity.SerialState; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.bukkit.world.entity.BukkitEntityType; import org.bukkit.block.CreatureSpawner; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitSign.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitSign.java index be339bfeb..08fc00e46 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitSign.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitSign.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.world.block.state; -import com.dfsek.terra.api.block.state.SerialState; -import com.dfsek.terra.api.block.state.Sign; +import com.dfsek.terra.api.block.entity.SerialState; +import com.dfsek.terra.api.block.entity.Sign; import org.jetbrains.annotations.NotNull; @SuppressWarnings("deprecation") diff --git 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 index 5ee4bf7cd..e457b3052 100644 --- 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,7 +1,7 @@ package com.dfsek.terra.fabric.mixin.implementations.block; import com.dfsek.terra.api.block.BlockState; -import com.dfsek.terra.api.block.state.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.fabric.util.FabricAdapter; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/LootableContainerBlockEntityMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/LootableContainerBlockEntityMixin.java index 588c1b463..e3df32ccf 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/LootableContainerBlockEntityMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/LootableContainerBlockEntityMixin.java @@ -1,6 +1,6 @@ package com.dfsek.terra.fabric.mixin.implementations.block.state; -import com.dfsek.terra.api.block.state.Container; +import com.dfsek.terra.api.block.entity.Container; import com.dfsek.terra.api.inventory.Inventory; import com.dfsek.terra.fabric.mixin.implementations.block.BlockEntityMixin; import net.minecraft.block.entity.LootableContainerBlockEntity; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java index 4102ddde9..83983067f 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.mixin.implementations.block.state; -import com.dfsek.terra.api.block.state.MobSpawner; -import com.dfsek.terra.api.block.state.SerialState; +import com.dfsek.terra.api.block.entity.MobSpawner; +import com.dfsek.terra.api.block.entity.SerialState; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.mixin.access.MobSpawnerLogicAccessor; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/SignBlockEntityMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/SignBlockEntityMixin.java index debd3a15c..2f0c36e8f 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/SignBlockEntityMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/SignBlockEntityMixin.java @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.mixin.implementations.block.state; -import com.dfsek.terra.api.block.state.SerialState; -import com.dfsek.terra.api.block.state.Sign; +import com.dfsek.terra.api.block.entity.SerialState; +import com.dfsek.terra.api.block.entity.Sign; import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; diff --git 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 index 39a6fbd55..150b3723d 100644 --- 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,7 +1,7 @@ package com.dfsek.terra.fabric.mixin.implementations.world; import com.dfsek.terra.api.block.BlockState; -import com.dfsek.terra.api.block.state.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.vector.Vector3; diff --git 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 index 832b6c4e9..ef51eef53 100644 --- 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,7 +1,7 @@ package com.dfsek.terra.fabric.mixin.implementations.world; import com.dfsek.terra.api.block.BlockState; -import com.dfsek.terra.api.block.state.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.vector.Vector3; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java index 02b3d8a1f..c85ab12a1 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java @@ -1,9 +1,9 @@ package com.dfsek.terra.fabric.util; -import com.dfsek.terra.api.block.state.BlockEntity; -import com.dfsek.terra.api.block.state.Container; -import com.dfsek.terra.api.block.state.MobSpawner; -import com.dfsek.terra.api.block.state.Sign; +import com.dfsek.terra.api.block.entity.BlockEntity; +import com.dfsek.terra.api.block.entity.Container; +import com.dfsek.terra.api.block.entity.MobSpawner; +import com.dfsek.terra.api.block.entity.Sign; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.util.generic.pair.Pair; import com.dfsek.terra.config.builder.BiomeBuilder; diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java index d9dd869f4..4eceae900 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java @@ -2,9 +2,9 @@ package com.dfsek.terra.forge; import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.block.BlockFace; -import com.dfsek.terra.api.block.state.Container; -import com.dfsek.terra.api.block.state.MobSpawner; -import com.dfsek.terra.api.block.state.Sign; +import com.dfsek.terra.api.block.entity.Container; +import com.dfsek.terra.api.block.entity.MobSpawner; +import com.dfsek.terra.api.block.entity.Sign; import com.dfsek.terra.forge.block.ForgeBlockData; import com.dfsek.terra.forge.block.data.ForgeDirectional; import com.dfsek.terra.forge.block.data.ForgeMultipleFacing; @@ -55,7 +55,7 @@ public final class ForgeAdapter { return new ForgeBlockData(state); } - public static com.dfsek.terra.api.block.state.BlockState adapt(com.dfsek.terra.api.block.Block block) { + public static com.dfsek.terra.api.block.entity.BlockState adapt(com.dfsek.terra.api.block.Block block) { IWorld worldAccess = (IWorld) block.getLocation().getWorld(); TileEntity entity = worldAccess.getBlockEntity(adapt(block.getLocation().toVector())); diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java index f43b49905..6772a9825 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.block.entity.BlockState; import com.dfsek.terra.api.world.World; import com.dfsek.terra.forge.ForgeAdapter; import net.minecraft.block.FlowingFluidBlock; diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java index 614fad18b..00344d40c 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java @@ -2,7 +2,7 @@ package com.dfsek.terra.forge.mixin.implementations.block; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; -import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.block.entity.BlockState; import com.dfsek.terra.forge.ForgeAdapter; import com.dfsek.terra.forge.block.ForgeBlock; import net.minecraft.tileentity.TileEntity; diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java index 3b93eafef..c7585535f 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java @@ -1,6 +1,6 @@ package com.dfsek.terra.forge.mixin.implementations.block.state; -import com.dfsek.terra.api.block.state.Container; +import com.dfsek.terra.api.block.entity.Container; import com.dfsek.terra.api.inventory.Inventory; import com.dfsek.terra.forge.mixin.implementations.block.TileEntityMixin; import net.minecraft.tileentity.LockableLootTileEntity; diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java index 18a3df3cd..13ed6a0ca 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java @@ -1,7 +1,7 @@ package com.dfsek.terra.forge.mixin.implementations.block.state; -import com.dfsek.terra.api.block.state.MobSpawner; -import com.dfsek.terra.api.block.state.SerialState; +import com.dfsek.terra.api.block.entity.MobSpawner; +import com.dfsek.terra.api.block.entity.SerialState; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.forge.TerraForgePlugin; import com.dfsek.terra.forge.mixin.access.AbstractSpawnerAccessor; diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java index 691530c4d..e759ffe4b 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java @@ -1,7 +1,7 @@ package com.dfsek.terra.forge.mixin.implementations.block.state; -import com.dfsek.terra.api.block.state.SerialState; -import com.dfsek.terra.api.block.state.Sign; +import com.dfsek.terra.api.block.entity.SerialState; +import com.dfsek.terra.api.block.entity.Sign; import net.minecraft.tileentity.SignTileEntity; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlockEntity.java b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlockEntity.java index 7e0bb1eac..60d9c4db5 100644 --- 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,7 +1,7 @@ package com.dfsek.terra.platform; import com.dfsek.terra.api.block.BlockState; -import com.dfsek.terra.api.block.state.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.vector.Vector3; public class DirectBlockEntity implements BlockEntity { diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java index ceddd527f..d842578d0 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java +++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java @@ -2,7 +2,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.BlockEntity; +import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.vector.Vector3;