From 23c795a2e7a0f03fd24c9dc9bbee3589853e412f Mon Sep 17 00:00:00 2001
From: zhe <wangzhe@mailbox.org>
Date: Fri, 12 Nov 2021 17:32:14 +0100
Subject: [PATCH] shape

---
 out/production/Tetris/Tetris/Board$1.class | Bin 775 -> 775 bytes
 out/production/Tetris/Tetris/Board.class   | Bin 1270 -> 1623 bytes
 out/production/Tetris/Tetris/GameGui.class | Bin 953 -> 953 bytes
 src/Tetris/Board.java                      |  29 +++++++++++++++++----
 src/Tetris/GameGui.java                    |   3 ++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/out/production/Tetris/Tetris/Board$1.class b/out/production/Tetris/Tetris/Board$1.class
index cd36855d74d50084cf9d43a64336af385e22cb29..9671a62a4b61a136ce67f8b7a07b2208077b88b5 100644
GIT binary patch
delta 27
icmZo?YiHY##l$Mbz{wyzIiD$*Rh~hRL1FT7CI<jg<ORY2

delta 27
icmZo?YiHY##l$Miz{wyoIiD$*Rf0i~L2~kOCI<jflm(^$

diff --git a/out/production/Tetris/Tetris/Board.class b/out/production/Tetris/Tetris/Board.class
index 5149e40589bdb970b45c4dbdd0cf4bcbb909fd02..43b8707f9f086b3fad579495ef9e714af8f4f49c 100644
GIT binary patch
literal 1623
zcmZuxO;;OL7=CUhA;~a60u+UYV5OBbsZEQuS}AA<Unyy+Nra|UaR?)s8fJ1PLviEE
zy7DKul8tM7B%ITpcGoWShxi9v^>EbZPJqOtIhpsq-yhF=XMX$Z=?ehY@TH0&Oa*Z>
zh>0+Km=0nlh>yeQ!Y5MB1Th;#R)vZ=6=BRv<$~lEW#p1dF(=6_70bxWxZ9GuBgsk-
zcLlVZWf@MkrZ*Z!L!f(hB~zH&Sj)|omIOpjpeJiv4Oh3^RlT-rDC|pRRLgB?KDW43
zlDa_wbvD0}UEV0>?$1k2Tp;3k6{Jrqqty2aL_75D6afK$&9>_T1Nn#gBmJ9nW6!j<
z(<O7qaHa$To3`$33G}b8d-k-x=ccoE&Gw9qs$Mq)x^9}5>COl!iHoaDn6<a4?aP~%
zac6gD({M`qW{sNuyj{_2tGZ)K`B>?9t0pn%&6f<<F&pVwS&)@`>$+*VS$n5$TZZKd
z3?<qfEIN9<YE~LkvYvRz$7FTK-XpEpHOkv36L}q<`V-ost5?3ht=Et1t3`X)sTd2U
z>`?WpUzSK{xQHY{?`%uMJD4Dp|AR%ZjA^5z;ZqbeBs};30L$q*)1JR7ixnj)X*iDy
z8a_i(!xhl5iZu=QuogsF!+or4cpx)>jxRK9V4bLTroVMpw+znTRi4l1SJrqP+Mu1R
zEt>c@))K?<M6T^<JR;!fOvN>AD{nSjgO}AqI>0;Wa226#!(B7C+^V;7-q$b{ONO~!
zr7?Pn#0lyQ_{yx+3Py$IU?Rt#tQnrm6qYv@3z;$<8U}aGYsIy7?77vlbPjDf`kuT|
zILB9Oh<7@KVZ6ylV1$wnXUWGp<WchR4tb3HTOIN_@^5#@<IF+qy<A+gcXEH;Ddc5f
zr4*%oRu(+Bl7|q<h#DDu3B`8+e=_hKfwI!|oaif05G<Dc9t}uJp=A)KYEdj6Ae4ND
za5*aed<M15jNOOO4$zbQ6+KP#{^C`?L^{IH2-vM31BhS{3)DPd{}qhmU0SqOPq>UU
zCBM8ot$sy?k$&p-lc_`Wr4%LEM1)VYiT>0R3^XyQOvhL-^kN@bWoA^e$|Qv=l8a4_
zPQJoe>V&6zDi(=XNBKnJkvOwFR>aSL|NhuV`jn|6XZA6iQX=tKH7YL2qlq(~^$%(7
zmR6ZTktFK7cWRZ>Dv;AIAWAxc0N<biVn0Id1<pCi`KCExj`Ni%Z%}XGI(F~@zUBEH
zZr}%egdchSL{Ev#4CkM~hm0L&_84Q|Bj>|5`D-5cJ-PQiPHwk_pyaMIt6(HBhVT($
i;)tK&tFIB@{|G|7#@XY8>2A=?$I@@`R2io7<nJHfLPz=l

delta 699
zcmY*XK~ED=5dPk7%ew0mx3z+`EwqTByVw;(MJh@Gty0w57_}ZGO(X&#G$}+pnDpYw
z8`*#0#j{4Xi6kCOy!Z!<zd(P0G0_n9dn*Urmz|k!W_ISAdHY%ZFduyS{q8-0QB*C&
zaoWJJfnF0DMhu)WFlwO#XDvi=PC3sjYfNQcun5PMC|J0N2@{uaSy_`x6b(#mE<fD-
zIqnxk%l{xM-C5)W<ei1}=F*xs)u=ZgN%WxCzpo8evY3|0Vn!m3jKme>BnELp;wnlK
z*HAKWU1Anx19K8La8u$IDiXI*7Kks`pVXgvYa2_ekG<JSeRW~Q|E9gjcPhVE-&psi
z8!L^bfH_mFmgh^=VokuF`#)OnpXtM`I5!bR5(ylJKo^mQZsH?*aFY1w9-LwhS%<lt
zC)9$&<XEAPXb}c2An&vx9NV%JAE9eoh&bDb)?(uOHacpI8Ev%oZNYTj!VF-&4htQl
z>>?#_;}O_AhcJK?PO)V_z4Bja9H$q|;L>*6e&N08^xbpZHuk%^?gWs04+Q9R-{4>X
zTc1eViI+&ay4{mrjENyb=>Rc*KALI8o@?UOpRbCC4#mTPMVTd=99i^n3H_7<7@;0x
z-$`avsPAGZ<mQl1n&%{!#b1S%6I$f7%U4-0vjyh?XN&A0Eq)=j10gch{4CFa29FKF
J_JTu&&tFD>W0e2^

diff --git a/out/production/Tetris/Tetris/GameGui.class b/out/production/Tetris/Tetris/GameGui.class
index 978ce99a4ed0a7bcbccfd3ea353e638b9e47f177..75c7ab80ce441b56387b5f73503a69ba729772b3 100644
GIT binary patch
delta 23
ecmdnVzLR}JI5VU0<OpU5Rxt(+2Jy*rnPmV<<pov%

delta 23
ecmdnVzLR}JI5VTr<OpU5R#65H2C>O=nPmV<$OTgX

diff --git a/src/Tetris/Board.java b/src/Tetris/Board.java
index 3995db5..38d85ed 100644
--- a/src/Tetris/Board.java
+++ b/src/Tetris/Board.java
@@ -12,8 +12,15 @@ public class Board extends JPanel
   public static final int BOARD_WIDTH=10;
   public static final int BOARD_HEIGHT=20;
   public static final int BLOCK_SIZE=30;
+
+  public static final int BOARDRIGHT_WIDTH=15;
+  public static final int BOARDRIGHT_HEIGHT=5;
   private Timer loop;
   private Color[][] board = new Color[BOARD_WIDTH][BOARD_HEIGHT];
+  private Color[] [] shape ={
+          {Color.YELLOW,Color.YELLOW,Color.YELLOW},
+          {null,Color.YELLOW,null}
+  };
 
   public Board() {
     loop = new Timer(500, new ActionListener() {
@@ -30,16 +37,28 @@ public class Board extends JPanel
   @Override
   protected void paintComponent(Graphics g) {
     super.paintComponent(g);
-    g.fillRect(0,0,getWidth(),getHeight());
+    g.fillRect(0, 0, getWidth(), getHeight());
     g.setColor(Color.DARK_GRAY);
 
-    for(int row= 0; row< BOARD_HEIGHT;row++)
-    {
+    //shape mit 2-Forschleife
+    for(int i=0;i< shape.length;i++){
+      for(int j = 0;j< shape[0].length;j++){
+          if(shape[i][j] !=null){
+            g.setColor(shape[i][j]);
+            g.fillRect(i*BLOCK_SIZE,j*BLOCK_SIZE,BLOCK_SIZE,BLOCK_SIZE);
+          }
+      }
+
+    }
+
+    for (int row = 0; row < BOARD_HEIGHT+1; row++) {
       g.drawLine(0, BLOCK_SIZE * row, BLOCK_SIZE * BOARD_WIDTH, BLOCK_SIZE * row);
     }
-    for(int col= 0; col< BOARD_WIDTH +1; col++)
-    {
+    for (int col = 0; col < BOARD_WIDTH+1; col++) {
       g.drawLine(col * BLOCK_SIZE, 0, col * BLOCK_SIZE, BLOCK_SIZE * BOARD_HEIGHT);
     }
+
   }
+
+
 }
diff --git a/src/Tetris/GameGui.java b/src/Tetris/GameGui.java
index a2fd2c1..ef98f26 100644
--- a/src/Tetris/GameGui.java
+++ b/src/Tetris/GameGui.java
@@ -1,6 +1,6 @@
 package Tetris;
-
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 
 public class GameGui {
     public static final int width= 500, height =650;
@@ -15,6 +15,7 @@ public class GameGui {
         window.setVisible(true);
         board = new Board();
         window.add(board);
+
     }
     public static void main(String [] args)
     {