refactor block entity package

This commit is contained in:
dfsek
2021-06-25 20:30:55 -07:00
parent edb5e316ba
commit 4ecb08619f
31 changed files with 45 additions and 45 deletions
@@ -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.Handle;
import com.dfsek.terra.api.block.BlockState; import com.dfsek.terra.api.block.BlockState;
@@ -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; import com.dfsek.terra.api.inventory.BlockInventoryHolder;
@@ -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 com.dfsek.terra.api.entity.EntityType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -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.HashMap;
import java.util.Map; import java.util.Map;
@@ -1,4 +1,4 @@
package com.dfsek.terra.api.block.state; package com.dfsek.terra.api.block.entity;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -1,6 +1,6 @@
package com.dfsek.terra.api.event.events.world.generation; 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.config.ConfigPack;
import com.dfsek.terra.api.event.events.AbstractCancellable; import com.dfsek.terra.api.event.events.AbstractCancellable;
import com.dfsek.terra.api.event.events.Cancellable; import com.dfsek.terra.api.event.events.Cancellable;
@@ -2,7 +2,7 @@ package com.dfsek.terra.api.world;
import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.Handle;
import com.dfsek.terra.api.block.BlockState; 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.Entity;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
@@ -1,8 +1,8 @@
package com.dfsek.terra.api.structures.structure.buffer.items; package com.dfsek.terra.api.structures.structure.buffer.items;
import com.dfsek.terra.api.TerraPlugin; 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.block.state.Container; import com.dfsek.terra.api.block.entity.Container;
import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent;
import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structure.buffer.BufferedItem;
@@ -1,7 +1,7 @@
package com.dfsek.terra.api.structures.structure.buffer.items; package com.dfsek.terra.api.structures.structure.buffer.items;
import com.dfsek.terra.api.TerraPlugin; 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.structure.buffer.BufferedItem;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
@@ -2,8 +2,8 @@ package com.dfsek.terra.commands.structure;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.block.BlockState; 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.block.state.Sign; import com.dfsek.terra.api.block.entity.Sign;
import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.CommandTemplate;
import com.dfsek.terra.api.command.annotation.Argument; import com.dfsek.terra.api.command.annotation.Argument;
import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.Command;
@@ -1,7 +1,7 @@
package com.dfsek.terra.config.dummy; package com.dfsek.terra.config.dummy;
import com.dfsek.terra.api.block.BlockState; 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.Entity;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world; package com.dfsek.terra.bukkit.world;
import com.dfsek.terra.api.block.BlockState; 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.Entity;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block.state; package com.dfsek.terra.bukkit.world.block.state;
import com.dfsek.terra.api.block.BlockState; 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.api.vector.Vector3;
import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
@@ -1,6 +1,6 @@
package com.dfsek.terra.bukkit.world.block.state; 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.api.inventory.Inventory;
import com.dfsek.terra.bukkit.world.inventory.BukkitInventory; import com.dfsek.terra.bukkit.world.inventory.BukkitInventory;
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block.state; package com.dfsek.terra.bukkit.world.block.state;
import com.dfsek.terra.api.block.state.MobSpawner; import com.dfsek.terra.api.block.entity.MobSpawner;
import com.dfsek.terra.api.block.state.SerialState; import com.dfsek.terra.api.block.entity.SerialState;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.bukkit.world.entity.BukkitEntityType; import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
import org.bukkit.block.CreatureSpawner; import org.bukkit.block.CreatureSpawner;
@@ -1,7 +1,7 @@
package com.dfsek.terra.bukkit.world.block.state; package com.dfsek.terra.bukkit.world.block.state;
import com.dfsek.terra.api.block.state.SerialState; import com.dfsek.terra.api.block.entity.SerialState;
import com.dfsek.terra.api.block.state.Sign; import com.dfsek.terra.api.block.entity.Sign;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.mixin.implementations.block; package com.dfsek.terra.fabric.mixin.implementations.block;
import com.dfsek.terra.api.block.BlockState; 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 com.dfsek.terra.fabric.util.FabricAdapter;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
@@ -1,6 +1,6 @@
package com.dfsek.terra.fabric.mixin.implementations.block.state; 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.api.inventory.Inventory;
import com.dfsek.terra.fabric.mixin.implementations.block.BlockEntityMixin; import com.dfsek.terra.fabric.mixin.implementations.block.BlockEntityMixin;
import net.minecraft.block.entity.LootableContainerBlockEntity; import net.minecraft.block.entity.LootableContainerBlockEntity;
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.mixin.implementations.block.state; package com.dfsek.terra.fabric.mixin.implementations.block.state;
import com.dfsek.terra.api.block.state.MobSpawner; import com.dfsek.terra.api.block.entity.MobSpawner;
import com.dfsek.terra.api.block.state.SerialState; import com.dfsek.terra.api.block.entity.SerialState;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.TerraFabricPlugin;
import com.dfsek.terra.fabric.mixin.access.MobSpawnerLogicAccessor; import com.dfsek.terra.fabric.mixin.access.MobSpawnerLogicAccessor;
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.mixin.implementations.block.state; package com.dfsek.terra.fabric.mixin.implementations.block.state;
import com.dfsek.terra.api.block.state.SerialState; import com.dfsek.terra.api.block.entity.SerialState;
import com.dfsek.terra.api.block.state.Sign; import com.dfsek.terra.api.block.entity.Sign;
import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.mixin.implementations.world; package com.dfsek.terra.fabric.mixin.implementations.world;
import com.dfsek.terra.api.block.BlockState; 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.Entity;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.mixin.implementations.world; package com.dfsek.terra.fabric.mixin.implementations.world;
import com.dfsek.terra.api.block.BlockState; 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.Entity;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
@@ -1,9 +1,9 @@
package com.dfsek.terra.fabric.util; package com.dfsek.terra.fabric.util;
import com.dfsek.terra.api.block.state.BlockEntity; import com.dfsek.terra.api.block.entity.BlockEntity;
import com.dfsek.terra.api.block.state.Container; import com.dfsek.terra.api.block.entity.Container;
import com.dfsek.terra.api.block.state.MobSpawner; import com.dfsek.terra.api.block.entity.MobSpawner;
import com.dfsek.terra.api.block.state.Sign; import com.dfsek.terra.api.block.entity.Sign;
import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.util.generic.pair.Pair; import com.dfsek.terra.api.util.generic.pair.Pair;
import com.dfsek.terra.config.builder.BiomeBuilder; import com.dfsek.terra.config.builder.BiomeBuilder;
@@ -2,9 +2,9 @@ package com.dfsek.terra.forge;
import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.math.vector.Vector3;
import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.block.BlockFace;
import com.dfsek.terra.api.block.state.Container; import com.dfsek.terra.api.block.entity.Container;
import com.dfsek.terra.api.block.state.MobSpawner; import com.dfsek.terra.api.block.entity.MobSpawner;
import com.dfsek.terra.api.block.state.Sign; import com.dfsek.terra.api.block.entity.Sign;
import com.dfsek.terra.forge.block.ForgeBlockData; import com.dfsek.terra.forge.block.ForgeBlockData;
import com.dfsek.terra.forge.block.data.ForgeDirectional; import com.dfsek.terra.forge.block.data.ForgeDirectional;
import com.dfsek.terra.forge.block.data.ForgeMultipleFacing; import com.dfsek.terra.forge.block.data.ForgeMultipleFacing;
@@ -55,7 +55,7 @@ public final class ForgeAdapter {
return new ForgeBlockData(state); 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(); IWorld worldAccess = (IWorld) block.getLocation().getWorld();
TileEntity entity = worldAccess.getBlockEntity(adapt(block.getLocation().toVector())); TileEntity entity = worldAccess.getBlockEntity(adapt(block.getLocation().toVector()));
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.block.Block;
import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockData;
import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.block.BlockFace;
import com.dfsek.terra.api.block.BlockType; 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.api.world.World;
import com.dfsek.terra.forge.ForgeAdapter; import com.dfsek.terra.forge.ForgeAdapter;
import net.minecraft.block.FlowingFluidBlock; import net.minecraft.block.FlowingFluidBlock;
@@ -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.Block;
import com.dfsek.terra.api.block.BlockData; 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.ForgeAdapter;
import com.dfsek.terra.forge.block.ForgeBlock; import com.dfsek.terra.forge.block.ForgeBlock;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@@ -1,6 +1,6 @@
package com.dfsek.terra.forge.mixin.implementations.block.state; 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.api.inventory.Inventory;
import com.dfsek.terra.forge.mixin.implementations.block.TileEntityMixin; import com.dfsek.terra.forge.mixin.implementations.block.TileEntityMixin;
import net.minecraft.tileentity.LockableLootTileEntity; import net.minecraft.tileentity.LockableLootTileEntity;
@@ -1,7 +1,7 @@
package com.dfsek.terra.forge.mixin.implementations.block.state; package com.dfsek.terra.forge.mixin.implementations.block.state;
import com.dfsek.terra.api.block.state.MobSpawner; import com.dfsek.terra.api.block.entity.MobSpawner;
import com.dfsek.terra.api.block.state.SerialState; import com.dfsek.terra.api.block.entity.SerialState;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.forge.TerraForgePlugin; import com.dfsek.terra.forge.TerraForgePlugin;
import com.dfsek.terra.forge.mixin.access.AbstractSpawnerAccessor; import com.dfsek.terra.forge.mixin.access.AbstractSpawnerAccessor;
@@ -1,7 +1,7 @@
package com.dfsek.terra.forge.mixin.implementations.block.state; package com.dfsek.terra.forge.mixin.implementations.block.state;
import com.dfsek.terra.api.block.state.SerialState; import com.dfsek.terra.api.block.entity.SerialState;
import com.dfsek.terra.api.block.state.Sign; import com.dfsek.terra.api.block.entity.Sign;
import net.minecraft.tileentity.SignTileEntity; import net.minecraft.tileentity.SignTileEntity;
import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.StringTextComponent;
@@ -1,7 +1,7 @@
package com.dfsek.terra.platform; package com.dfsek.terra.platform;
import com.dfsek.terra.api.block.BlockState; 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.api.vector.Vector3;
public class DirectBlockEntity implements BlockEntity { public class DirectBlockEntity implements BlockEntity {
@@ -2,7 +2,7 @@ package com.dfsek.terra.platform;
import com.dfsek.terra.DirectUtils; import com.dfsek.terra.DirectUtils;
import com.dfsek.terra.api.block.BlockState; 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.Entity;
import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.EntityType;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;