Trying to make a Tetris game--why does my board look weird?

[jdawg mcgee]

Hi all. For the final project in my introductory comp sci course, I've been instructed to recreate Tetris in java. I have been having some difficulties getting the board to display properly--the board that shows up on the screen has too many cells (in the paintComponent method of GameBoardPanel, change fillRect to drawRect and you'll see what I mean), and when I add blocks onto the board, the display sometimes shows additional unintended colored cells. Also, my canItFall method doesn't seem to be working properly, and I get the feeling that this might be a related problem issuing from the same cause.

I have posted my code thus far below (I've attached most of the code including one of the specific Tetromino block classes, though I'm fairly certain the problem is in GameBoardPanel). I tend to write/debug my codes as I go, hence the "under construction" appearance. I hugely appreciate any help you guys have to offer, as well as additional comments or suggestions on how I can improve my code/where I should go from here. Thanks!

  import javax.swing.* ;
public class Tetris{

public static void main (String args[]){
	
JFrame frame = new JFrame("Ultimate Final Tetris Deathmatch Apocalypse III");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.getContentPane().add(new TetrisFrame());
frame.pack();
frame.setVisible(true);

}
}  

 

import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.text.*;
public class TetrisFrame extends JPanel{
	
private JButton uhpushityeah;
JPanel statspanel;
GameBoardPanel gamepanel;
private final int DELAY = 100000;
private Timer timer;
private int startX, startY, moveY, blockwidth, blockheight, rows, columns, xcoord, ycoord;
Block piece;

public TetrisFrame ()
{
setPreferredSize(new Dimension(800, 800));
gamepanel = new GameBoardPanel();
statspanel = new JPanel();
JSplitPane sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, gamepanel, statspanel);
add(sp);

statspanel.setLayout(new BorderLayout());
gamepanel.setPreferredSize(new Dimension(400, 600));
gamepanel.setFocusable(true);

uhpushityeah = new JButton ("COME TASTE THE BLOCK-STACKING FURY, CANDYASS.");
//uhpushityeah.addActionListener (new ButtonListener());
statspanel.add(uhpushityeah, BorderLayout.CENTER);

timer = new Timer(DELAY, new TetrisListener());
timer.start();

piece = gamepanel.createBlock();
gamepanel.addToBoard(piece);

}
} 

  

public Block createBlock(){
	Random generator = new Random();
	whichblock = generator.nextInt(7);
	switch(whichblock){
		case 0:
			nextblock = new Tblock();			
		break;
		case 1:
			nextblock = new Oblock();			
		break;
		case 2:
			nextblock = new Zblock();			
		break;
		case 3:
			nextblock = new Sblock();			
		break;
		case 4:
			nextblock = new Jblock();			
		break;
		case 5:
			nextblock = new Iblock();			
		break;
		case 6:
			nextblock = new Lblock();			
		break;
	}
//	Tblock test = new Tblock();
	gameObjects[numBlocks] = nextblock;
	addToBoard(nextblock);
	numBlocks++;
	return nextblock;
}
public void addToBoard(Block newblock){
	int[][] geom = newblock.getGeometry();
	newblock.setX(startX);
	newblock.setY(startY);		
	repaint();	
	}
public void situateBlock(Block curblock){
	int[][] geom = curblock.getGeometry();
	for (int i = 0; i < 4; i++){
		gameboard[curblock.getY() + geom[i][1]][curblock.getX() + geom[i][0]].fillSquare();
		gameboard[curblock.getY() + geom[i][1]][curblock.getX() + geom[i][0]].setColor(curblock.getColor());
		}		
	}
public boolean canItFall(Block curblock){
	int[][] geom = curblock.getGeometry();
	for(int i = 0; i < 4; i++){
		System.out.println(gameboard[curblock.getY() + geom[i][1]+1][curblock.getX() + geom[i][0]].isItEmpty());
		if(getY() + geom[i][1] == 20)
			return false;
		else if(gameboard[curblock.getY() + geom[i][1]+1][curblock.getX() + geom[i][0]].isItEmpty() == false)
			return false;
		
	}
	return true;
	}
private class ControlListener implements KeyListener{
public void keyPressed(KeyEvent event){
	switch(event.getKeyCode()){
	case KeyEvent.VK_UP:
		gameObjects[numBlocks-1].rotate();
	break;
	case KeyEvent.VK_DOWN:
		
	break;
	case KeyEvent.VK_LEFT:
		gameObjects[numBlocks-1].moveLeft();
	break;
	case KeyEvent.VK_RIGHT:
		gameObjects[numBlocks-1].moveRight();
	break;
	}
	repaint();
}
public void keyTyped(KeyEvent event){}
public void keyReleased(KeyEvent event){}
}
}	

 

   

import java.awt.Color;

public class Tblock extends Block{

int[][] geom1 = {{-1,0},{0,0},{1,0},{0,1}};
int[][] geom2 = {{0,1},{0,0},{0,-1},{-1,0}};
int[][] geom3 = {{0,-1},{1,0},{0,0},{-1,0}};
int[][] geom4 = {{0,0},{1,0},{0,1},{0,-1}};
	
	public Tblock ()
	{
		super();
		setColor(Color.magenta);
		geometry = geom1;
	}
	public void rotate ()
	{
		if (orientation == 0)
		{
			geometry = geom1;
		}

		if (orientation == 1)
		{
			geometry = geom2;
		}

		if (orientation == 2)
		{
			geometry = geom3;
		}

		if (orientation == 3)
		{
			geometry = geom4;
		}

		orientation = ((orientation + 1) % 4);
	}
}

 

   
import java.awt.*;
import javax.swing.*;
import javax.swing.event.*;

public class Square{
private Color color;
public boolean empty;
private int x, y;

public Square(){
	color = Color.black;
	empty = true;
}	
public void setX(int xcoord){
	x = xcoord;	
}
public void setY(int ycoord){
	y = ycoord;	
}
public int getX(){
	return x;
}
public int getY(){
	return y;
}
public void setColor(Color anycoloryoulike){
	color = anycoloryoulike;
}
public Color getColor(){	
	return color;
}
public void fillSquare(){
	empty = false;	
}
public boolean isItEmpty(){
	return empty;
}


} 

import java.awt.Color;

abstract public class Block
{
	int[][] geometry;
	protected int x, y, orientation;
	protected Color colorofshape;
	protected boolean isitfalling;

	public Block(){
		geometry = new int[4][2];
		orientation = 0;
		colorofshape = Color.black;
	}

	public int[][] getGeometry()
	{
		return geometry;
	}

	public int getX()
	{
		return x;
	}

	public int getY()
	{
		return y;
	}

	public void setX(int x)
	{
		this.x = x;
	}

	public void setY(int y)
	{
		this.y = y;
	}
	
	public Color getColor()
	{
		return colorofshape;
	}

	public void setColor(Color c)
	{
		colorofshape = c;
	}
	
	public abstract void rotate ();
	
	public void moveLeft(){
		x = x-1;	
	}
	
	public void moveRight(){
		x += 1;	
	}
	
	public void fallDown(){
		y += 1;
	}	
	
}

[Rob Spoor]

Moving to Game Development.