Deco block (#3511)

Adds a decoration block which allows to connect a decoration with a block to upgrade/repair it.
Fixes rotation and mirror of tile entities (includes it)
Fixes issues with entity placement
Fixes issues where the blockhut would not rotate accordingly on placement

build.properties

@@ -13,5 +13,5 @@ tinker_version=2.10.0.+
 dynamic_tree_version=0.7.+
 jei_version=4.8.5.147
 c_b_version=14.0.162
-structurize_version=0.10.70-ALPHA
+structurize_version=0.10.72-ALPHA
 

src/main/java/com/minecolonies/coremod/MineColonies.java

@@ -274,6 +274,8 @@ private static synchronized void initializeNetwork()
         getNetwork().registerMessage(SifterSettingsMessage.class, SifterSettingsMessage.class, ++id, Side.SERVER);
         getNetwork().registerMessage(HutRenameMessage.class, HutRenameMessage.class, ++id, Side.SERVER);
         getNetwork().registerMessage(BuildingHiringModeMessage.class, BuildingHiringModeMessage.class, ++id, Side.SERVER);
+        getNetwork().registerMessage(DecorationBuildRequestMessage.class, DecorationBuildRequestMessage.class, ++id, Side.SERVER);
+        getNetwork().registerMessage(DecorationControllUpdateMessage.class, DecorationControllUpdateMessage.class, ++id, Side.SERVER);
 
         //Client side only
         getNetwork().registerMessage(BlockParticleEffectMessage.class, BlockParticleEffectMessage.class, ++id, Side.CLIENT);

src/main/java/com/minecolonies/coremod/blocks/AbstractBlockMinecoloniesDirectional.java → src/main/java/com/minecolonies/coremod/blocks/AbstractBlockMinecoloniesHorizontal.java

@@ -9,9 +9,9 @@
 import net.minecraft.item.ItemBlock;
 import net.minecraftforge.registries.IForgeRegistry;
 
-public abstract class AbstractBlockMinecoloniesDirectional<B extends AbstractBlockMinecoloniesDirectional<B>> extends BlockHorizontal implements IBlockMinecolonies<B>
+public abstract class AbstractBlockMinecoloniesHorizontal<B extends AbstractBlockMinecoloniesHorizontal<B>> extends BlockHorizontal implements IBlockMinecolonies<B>
 {
-    public AbstractBlockMinecoloniesDirectional(final Material blockMaterialIn)
+    public AbstractBlockMinecoloniesHorizontal(final Material blockMaterialIn)
     {
         super(blockMaterialIn);
     }
@@ -30,7 +30,6 @@ public B registerBlock(final IForgeRegistry<Block> registry)
         return (B) this;
     }
 
-
     /**
      * Registery block at gameregistry.
      *

src/main/java/com/minecolonies/coremod/blocks/BlockBarrel.java

@@ -29,7 +29,7 @@
 
 import static com.minecolonies.api.util.constant.Suppression.DEPRECATION;
 
-public class BlockBarrel extends AbstractBlockMinecoloniesDirectional<BlockBarrel> implements ITileEntityProvider
+public class BlockBarrel extends AbstractBlockMinecoloniesHorizontal<BlockBarrel> implements ITileEntityProvider
 {
 
     public static final PropertyEnum<BarrelType> VARIANT        = PropertyEnum.create("variant", BarrelType.class);

src/main/java/com/minecolonies/coremod/blocks/BlockDecorationController.java

@@ -0,0 +1,258 @@
+package com.minecolonies.coremod.blocks;
+
+import com.ldtteam.structurize.blocks.interfaces.IAnchorBlock;
+import com.minecolonies.api.entity.ai.citizen.builder.IBuilderUndestroyable;
+import com.minecolonies.api.util.constant.Constants;
+import com.minecolonies.coremod.MineColonies;
+import com.minecolonies.coremod.creativetab.ModCreativeTabs;
+import com.minecolonies.coremod.tileentities.TileEntityDecorationController;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.state.BlockStateContainer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.*;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+
+import static com.minecolonies.api.util.constant.Suppression.DEPRECATION;
+
+/**
+ * Creates a decoration placerholder block.
+ */
+public class BlockDecorationController extends AbstractBlockMinecoloniesHorizontal<BlockDecorationController> implements IBuilderUndestroyable, IAnchorBlock
+{
+    /**
+     * The hardness this block has.
+     */
+    private static final float BLOCK_HARDNESS = 5F;
+
+    /**
+     * This blocks name.
+     */
+    private static final String BLOCK_NAME = "decorationcontroller";
+
+    /**
+     * The resistance this block has.
+     */
+    private static final float RESISTANCE = 1F;
+
+    /**
+     * If the block is mirrored.
+     */
+    public static PropertyBool MIRROR = PropertyBool.create("mirror");
+
+    /**
+     * The bounding boxes.
+     */
+    protected static final AxisAlignedBB AABB_NORTH = new AxisAlignedBB(0.4125D, 0.375D, 0.950D, 0.5875D, 0.625D, 1.0D);
+    protected static final AxisAlignedBB AABB_SOUTH = new AxisAlignedBB(0.4125D, 0.375D, 0.0D, 0.5875D, 0.625D, 0.050D);
+    protected static final AxisAlignedBB AABB_WEST = new AxisAlignedBB(0.950D, 0.375D, 0.4125D, 1.0D, 0.625D, 0.5875D);
+    protected static final AxisAlignedBB AABB_EAST  = new AxisAlignedBB(0.0D, 0.375D, 0.4125D, 0.050D, 0.625D, 0.5875D);
+
+    /**
+     * Constructor for the placerholder.
+     *
+     * @param blockMaterialIn the material.
+     */
+    public BlockDecorationController(final Material blockMaterialIn)
+    {
+        super(blockMaterialIn);
+        this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(MIRROR, false));
+        initBlock();
+    }
+
+    /**
+     * Initialize the block.
+     */
+    private void initBlock()
+    {
+        setRegistryName(Constants.MOD_ID.toLowerCase() + ":" + BLOCK_NAME);
+        setTranslationKey(String.format("%s.%s", Constants.MOD_ID.toLowerCase(), BLOCK_NAME));
+        setCreativeTab(ModCreativeTabs.MINECOLONIES);
+        setHardness(BLOCK_HARDNESS);
+        setResistance(RESISTANCE);
+    }
+
+    /**
+     * @deprecated
+     */
+    @Nullable
+    public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, @NotNull IBlockAccess worldIn, @NotNull BlockPos pos)
+    {
+        return NULL_AABB;
+    }
+
+    /**
+     * @deprecated
+     */
+    @NotNull
+    @Override
+    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos)
+    {
+        EnumFacing enumfacing = state.getValue(FACING);
+        switch (enumfacing)
+        {
+            case EAST:
+                return AABB_EAST;
+            case WEST:
+                return AABB_WEST;
+            case SOUTH:
+                return AABB_SOUTH;
+            case NORTH:
+            default:
+                return AABB_NORTH;
+        }
+    }
+
+    @Override
+    public boolean onBlockActivated(
+      final World worldIn,
+      final BlockPos pos,
+      final IBlockState state,
+      final EntityPlayer playerIn,
+      final EnumHand hand,
+      final EnumFacing facing,
+      final float hitX,
+      final float hitY,
+      final float hitZ)
+    {
+        if (worldIn.isRemote)
+        {
+            final TileEntity tileEntity = worldIn.getTileEntity(pos);
+            if (tileEntity instanceof TileEntityDecorationController)
+            {
+                MineColonies.proxy.openDecorationControllerWindow(pos);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean hasTileEntity(final IBlockState state)
+    {
+        return true;
+    }
+
+    @NotNull
+    @Override
+    protected BlockStateContainer createBlockState()
+    {
+        return new BlockStateContainer(this, FACING, MIRROR);
+    }
+
+    @Nullable
+    @Override
+    public TileEntity createTileEntity(@NotNull final World world, @NotNull final IBlockState state)
+    {
+        return new TileEntityDecorationController();
+    }
+
+    @Override
+    public int getMetaFromState(final IBlockState state)
+    {
+        return state.getValue(FACING).getHorizontalIndex() + (state.getValue(MIRROR) ? 4 : 0);
+    }
+
+    @NotNull
+    @Override
+    public IBlockState getStateFromMeta(final int meta)
+    {
+        int theMeta = meta;
+        boolean mirrored = false;
+        if (meta > 3)
+        {
+            mirrored = true;
+            theMeta = meta - 4;
+        }
+
+        return getDefaultState().withProperty(FACING, EnumFacing.byHorizontalIndex(theMeta)).withProperty(MIRROR, mirrored);
+    }
+
+    @NotNull
+    @Override
+    public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+    {
+        if (facing.getAxis().isHorizontal())
+        {
+            return super.getStateForPlacement(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer).withProperty(FACING, facing);
+        }
+        return super.getStateForPlacement(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer);
+    }
+
+    /**
+     * @deprecated
+     */
+    @NotNull
+    @Override
+    public IBlockState withRotation(@NotNull IBlockState state, Rotation rot)
+    {
+        return state.withProperty(FACING, rot.rotate(state.getValue(FACING)));
+    }
+
+    /**
+     * @deprecated
+     */
+    @NotNull
+    @Override
+    public IBlockState withMirror(@NotNull IBlockState state, Mirror mirrorIn)
+    {
+        return state.withProperty(MIRROR, mirrorIn != Mirror.NONE);
+    }
+
+    /**
+     * @deprecated (Remove this as soon as minecraft offers anything better).
+     */
+    @SuppressWarnings(DEPRECATION)
+    @Override
+    @Deprecated
+    public boolean isFullBlock(final IBlockState state)
+    {
+        return false;
+    }
+
+    /**
+     * @deprecated (Remove this as soon as minecraft offers anything better).
+     */
+    @SuppressWarnings(DEPRECATION)
+    @Override
+    @Deprecated
+    public boolean isFullCube(final IBlockState state)
+    {
+        return false;
+    }
+
+    /**
+     * @deprecated (Remove this as soon as minecraft offers anything better).
+     */
+    @SuppressWarnings(DEPRECATION)
+    @Override
+    @Deprecated
+    public boolean isOpaqueCube(final IBlockState state)
+    {
+        return false;
+    }
+
+    @NotNull
+    @Override
+    @SideOnly(Side.CLIENT)
+    public BlockRenderLayer getRenderLayer()
+    {
+        return BlockRenderLayer.SOLID;
+    }
+
+    @Override
+    public boolean doesSideBlockRendering(final IBlockState state, final IBlockAccess world, final BlockPos pos, final EnumFacing face)
+    {
+        return false;
+    }
+}