maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix multiblocks

Browse source
This commit is contained in:
modmuss50 2016-03-27 12:51:39 +01:00
parent 02931939b6
commit a0dea07407
1 changed files with 17 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
src/main/java/techreborn/multiblocks/MultiBlockCasing.java
View file

@ -1,6 +1,7 @@
package techreborn.multiblocks; package techreborn.multiblocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -11,6 +12,7 @@ import reborncore.common.multiblock.MultiblockControllerBase;
import reborncore.common.multiblock.MultiblockValidationException; import reborncore.common.multiblock.MultiblockValidationException;
import reborncore.common.multiblock.rectangular.RectangularMultiblockControllerBase; import reborncore.common.multiblock.rectangular.RectangularMultiblockControllerBase;
import reborncore.common.multiblock.rectangular.RectangularMultiblockTileEntityBase; import reborncore.common.multiblock.rectangular.RectangularMultiblockTileEntityBase;
import techreborn.init.ModBlocks;
public class MultiBlockCasing extends RectangularMultiblockControllerBase public class MultiBlockCasing extends RectangularMultiblockControllerBase
{ {
@ -32,7 +34,6 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase
isMachineWhole(); isMachineWhole();
} catch (MultiblockValidationException e) } catch (MultiblockValidationException e)
{ {
System.out.println(e.getLocalizedMessage());
e.printStackTrace(); e.printStackTrace();
value = e.getLocalizedMessage(); value = e.getLocalizedMessage();
} }
@ -365,6 +366,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase
{ {
Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock(); Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
System.out.println(block);
if (block.isAir(world.getBlockState(new BlockPos(x, y, z)), world, new BlockPos(x, y, z))) if (block.isAir(world.getBlockState(new BlockPos(x, y, z)), world, new BlockPos(x, y, z)))
{ {
@ -377,112 +379,18 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase
} }
} }
// /** @Override
// * This is horrible code, don't look at this protected void isBlockGoodForFrame(World world, int x, int y, int z) throws MultiblockValidationException
// * {
// * @param x Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
// * @param y world.setBlockState(new BlockPos(x, y, z), Blocks.bedrock.getDefaultState(), 3);
// * @param z if (block == ModBlocks.MachineCasing)
// * @return {
// */
//
// public boolean checkIfStarShape(int x, int y, int z) {
// boolean isSolid = true;
//
// TileEntity te;
// {//corners
// te = this.worldObj.getTileEntity(x, y, z);
// isSolid = checkTeIsCorner(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x + 2, y, z);
// isSolid = checkTeIsCorner(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x, y, z + 2);
// isSolid = checkTeIsCorner(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x + 2, y, z + 2);
// isSolid = checkTeIsCorner(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x, y + 2, z);
// isSolid = checkTeIsCorner(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x + 2, y + 2, z);
// isSolid = checkTeIsCorner(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x, y + 2, z + 2);
// isSolid = checkTeIsCorner(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x + 2, y + 2, z + 2);
// isSolid = checkTeIsCorner(te);
// if (!isSolid) {
// return false;
// }
// }
// {//middle blocks
// for (int i = 0; i < 3; i++) {
// System.out.println(this.worldObj.getBlock(x, y - 1, z));
// te = this.worldObj.getTileEntity(x + 1, y + i, z);
// isSolid = checkTeIsCenter(te);
// if (!isSolid) {
// return false;
// }
// te = this.worldObj.getTileEntity(x, y + i, z + 1);
// isSolid = checkTeIsCenter(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x + 1, y + i, z + 1);
// isSolid = checkTeIsCenter(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x + 2, y + i, z + 1);
// isSolid = checkTeIsCenter(te);
// if (!isSolid) {
// return false;
// }
//
// te = this.worldObj.getTileEntity(x + 1, y + i, z + 2);
// isSolid = checkTeIsCenter(te);
// if (!isSolid) {
// return false;
// }
// }
// }
// return isSolid;
// }
//
// public boolean checkTeIsCorner(TileEntity te) {
// return (te.blockType instanceof BlockMachineCasing && te.blockMetadata ==
// 0);
// }
//
// public boolean checkTeIsCenter(TileEntity te) {
// return (te.blockType instanceof BlockMachineCasing && te.blockMetadata ==
// 1);
// }
} } else
{
super.isBlockGoodForFrame(world, x, y, z);
}
}
}