装饰器模式

pom.xml

@@ -33,16 +33,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-all</artifactId>
-			<version>4.1.76.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
-			<version>3.5.2</version>
-		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/example/tankbattle/Audio.java

@@ -57,12 +57,12 @@ public class Audio {
 
 	public void play() {
 		try {
-			byte[] b = new byte[1024*5];
+			byte[] b = new byte[1024 * 5];
 			int len = 0;
-			sourceDataLine.open(audioFormat, 1024*5);
+			sourceDataLine.open(audioFormat, 1024 * 5);
 			sourceDataLine.start();
-			//System.out.println(audioInputStream.markSupported());
-			audioInputStream.mark(12358946);
+			System.out.println(audioInputStream.markSupported());
+			// audioInputStream.mark(12358946);
 			while ((len = audioInputStream.read(b)) > 0) {
 				sourceDataLine.write(b, 0, len);
 			}

src/main/java/com/example/tankbattle/Bullet.java

@@ -1,76 +1,32 @@
 package com.example.tankbattle;
 
-import com.example.tankbattle.net.Client;
-import com.example.tankbattle.net.TankDieMessage;
-
 import java.awt.Graphics;
 import java.awt.Rectangle;
-import java.util.UUID;
 
-public class Bullet {
+public class Bullet extends GameObject{
     private static final int SPEED = 6;
     public static int WIDTH = ResourceMgr.bulletD.getWidth();
     public static int HEIGHT = ResourceMgr.bulletD.getHeight();
 
-    private Rectangle rect = new Rectangle();
-
-    private UUID id = UUID.randomUUID();
-
-    private UUID playerId;
-
-    public UUID getPlayerId() {
-        return playerId;
-    }
-
-    public void setPlayerId(UUID playerId) {
-        this.playerId = playerId;
-    }
-
-    private int x, y;
+    Rectangle rect = new Rectangle();
 
     private Dir dir;
 
     private boolean living = true;
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.x = x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public void setY(int y) {
-        this.y = y;
-    }
-
-    public Dir getDir() {
-        return dir;
-    }
-
-    public void setDir(Dir dir) {
-        this.dir = dir;
-    }
-
-    TankFrame tf = null;
     private Group group = Group.BAD;
 
-    public Bullet(UUID playerId,int x, int y, Dir dir, Group group, TankFrame tf) {
-        this.playerId = playerId;
+    public Bullet(int x, int y, Dir dir, Group group) {
         this.x = x;
         this.y = y;
         this.dir = dir;
         this.group = group;
-        this.tf = tf;
 
         rect.x = this.x;
         rect.y = this.y;
         rect.width = WIDTH;
         rect.height = HEIGHT;
+
+        GameModel.getInstance().add(this);
     }
 
     public Group getGroup() {
@@ -81,9 +37,18 @@ public class Bullet {
         this.group = group;
     }
 
+    public Rectangle getRect() {
+        return rect;
+    }
+
+    public void setRect(Rectangle rect) {
+        this.rect = rect;
+    }
+
+    @Override
     public void paint(Graphics g) {
         if (!living) {
-            tf.bullets.remove(this);
+            GameModel.getInstance().remove(this);
         }
         switch (dir) {
             case LEFT:
@@ -105,6 +70,16 @@ public class Bullet {
         move();
     }
 
+    @Override
+    public int getWidth() {
+        return 0;
+    }
+
+    @Override
+    public int getHeight() {
+        return 0;
+    }
+
     private void move() {
         switch (dir) {
             case LEFT:
@@ -130,34 +105,20 @@ public class Bullet {
         if (x < 0 || y < 0 || x > TankFrame.GAME_WIDTH || y > TankFrame.GAME_HEIGHT) living = false;
     }
 
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public void collideWith(Tank tank){
-        if (this.playerId.equals(tank.getId())) {
-            return;
-        }
-        if (this.living && tank.isLiving() && this.rect.intersects(tank.rect)) {
+    public boolean collideWith(Tank tank){
+        if (this.group == tank.getGroup()) return false;
+        if (rect.intersects(tank.rect)) {
             tank.die();
             this.die();
-            Client.INSTANCE.send(new TankDieMessage(this.id, tank.getId()));
+            int eX = tank.getX() + Tank.WIDTH / 2 - Explode.WIDTH / 2;
+            int eY = tank.getY() + Tank.HEIGHT / 2 - Explode.HEIGHT / 2;
+            GameModel.getInstance().add(new Explode(eX, eY));
+            return true;
         }
+        return false;
     }
 
     public void die() {
         this.living = false;
     }
-
-    public boolean isLiving() {
-        return living;
-    }
-
-    public void setLiving(boolean living) {
-        this.living = living;
-    }
 }

src/main/java/com/example/tankbattle/Explode.java

@@ -2,28 +2,36 @@ package com.example.tankbattle;
 
 import java.awt.Graphics;
 
-public class Explode {
+public class Explode extends GameObject {
     public static int WIDTH = ResourceMgr.explodes[0].getWidth();
     public static int HEIGHT = ResourceMgr.explodes[0].getHeight();
 
-    private int x, y;
-
     private int step = 0;
 
     public Explode(int x, int y) {
         this.x = x;
         this.y = y;
 
-        new Thread(()->new Audio("audio/explode.wav").play()).start();
+        new Thread(() -> new Audio("audio/explode.wav").play()).start();
     }
 
+    @Override
     public void paint(Graphics g) {
 
         g.drawImage(ResourceMgr.explodes[step++], x, y, null);
 
-        if (step >= ResourceMgr.explodes.length) {
-            TankFrame.INSTANCE.explodes.remove(this);
-        }
+        if (step >= ResourceMgr.explodes.length)
+            GameModel.getInstance().remove(this);
+
+    }
+
+    @Override
+    public int getWidth() {
+        return 0;
+    }
 
+    @Override
+    public int getHeight() {
+        return 0;
     }
 }

src/main/java/com/example/tankbattle/GameModel.java

@@ -0,0 +1,98 @@
+package com.example.tankbattle;
+
+import com.example.tankbattle.cor.ColliderChain;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GameModel {
+
+    Tank myTank;
+
+    static List<Bullet> bullets = new ArrayList<>();
+    static List<Tank> tanks = new ArrayList<>();
+    static List<Explode> explodes = new ArrayList<>();
+    static ColliderChain chain = new ColliderChain();
+
+    static List<GameObject> objects = new ArrayList<>();
+
+    private static final GameModel INSTANCE = new GameModel();
+
+    public static GameModel getInstance(){
+        return INSTANCE;
+    }
+
+    public GameModel() {
+    }
+
+    private void init(){
+        myTank = new Tank(200, 400, Dir.DOWN, Group.GOOD);
+
+        int initTankCount = Integer.valueOf(PropertyMgr.get("initTankCount"));
+
+        // 初始化敌方坦克
+        for (int i = 0; i < initTankCount; i++) {
+            add(new Tank(50 + i * 80, 200, Dir.DOWN, Group.BAD));
+        }
+
+        add(myTank);
+
+        add(new Wall(150, 150, 200, 50));
+        add(new Wall(550, 150, 200, 50));
+        add(new Wall(300, 500, 200, 50));
+        add(new Wall(500, 300, 50, 200));
+    }
+
+    static {
+        getInstance().init();
+    }
+
+    public void add(GameObject go) {
+        objects.add(go);
+    }
+
+    public void remove(GameObject go) {
+        objects.remove(go);
+    }
+
+    public void paint(Graphics g) {
+        Color c = g.getColor();
+        g.setColor(Color.WHITE);
+        g.drawString("子弹的数量:" + bullets.size(), 10, 60);
+        g.drawString("敌方坦克的数量:" + tanks.size(), 10, 80);
+        g.drawString("爆炸的数量:" + explodes.size(), 10, 100);
+        g.setColor(c);
+
+        myTank.paint(g);
+        for (int i = 0; i < objects.size(); i++) {
+            objects.get(i).paint(g);
+        }
+
+        // 互相碰撞逻辑
+        for (int i = 0; i < objects.size(); i++) {
+            for (int j = 0; j < objects.size(); j++) {
+                GameObject o1 = objects.get(i);
+                GameObject o2 = objects.get(j);
+//                collider.collide(o1, o2);
+//                collider2.collide(o1, o2);
+                chain.collide(o1, o2);
+            }
+        }
+
+//        for (int i = 0; i < bullets.size(); i++) {
+//            for (int j = 0; j < tanks.size(); j++)
+//                bullets.get(i).collideWith(tanks.get(j));
+//        }
+
+//        for (Iterator<Bullet> it = bullets.iterator(); it.hasNext()) {
+//            Bullet b = it.next();
+//            if (!b.live) it.remove();
+//        }
+    }
+
+    public Tank getMainTank() {
+        return myTank;
+    }
+}

src/main/java/com/example/tankbattle/GameObject.java

@@ -0,0 +1,12 @@
+package com.example.tankbattle;
+
+import java.awt.Graphics;
+
+public abstract class GameObject {
+    public int x;
+    public int y;
+
+    public abstract void paint(Graphics g);
+    public abstract int getWidth();
+    public abstract int getHeight();
+}

src/main/java/com/example/tankbattle/Main.java

@@ -1,31 +1,14 @@
 package com.example.tankbattle;
 
-import com.example.tankbattle.net.Client;
-
 public class Main {
     public static void main(String[] args) throws InterruptedException {
-        TankFrame tf = TankFrame.INSTANCE;
-        tf.setVisible(true);
-
-//        int initTankCount = Integer.valueOf(PropertyMgr.get("initTankCount"));
-//
-//        // 初始化敌方坦克
-//        for (int i = 0; i < initTankCount; i++) {
-//            tf.tanks.add(new Tank(50 + i * 80, 200, Dir.DOWN, Group.BAD, tf));
-//        }
+        TankFrame tf = new TankFrame();
 
-        new Thread(() -> new Audio("audio/war1.wav").loop()).start();
-        new Thread(() -> {
-            while (true) {
-                try {
-                    Thread.sleep(25);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                tf.repaint();
-            }
-        }).start();
+        new Thread(()->new Audio("audio/war1.wav").loop()).start();
 
-        Client.INSTANCE.connect();
+        while (true) {
+            Thread.sleep(25);
+            tf.repaint();
+        }
     }
 }

src/main/java/com/example/tankbattle/ResourceMgr.java

@@ -5,22 +5,22 @@ import java.io.IOException;
 import javax.imageio.ImageIO;
 
 public class ResourceMgr {
-    public static BufferedImage GoodTankL, GoodTankU, GoodTankR, GoodTankD;
-    public static BufferedImage BadTankL, BadTankU, BadTankR, BadTankD;
+    public static BufferedImage goodTankL, goodTankU, goodTankR, goodTankD;
+    public static BufferedImage badTankL, badTankU, badTankR, badTankD;
     public static BufferedImage bulletL, bulletU,bulletR, bulletD;
     public static BufferedImage[] explodes = new BufferedImage[16];
 
     static {
         try {
-            GoodTankU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/GoodTank1.png"));
-            GoodTankL = ImageUtil.rotateImage(GoodTankU, -90);
-            GoodTankR = ImageUtil.rotateImage(GoodTankU, 90);
-            GoodTankD = ImageUtil.rotateImage(GoodTankU, 180);
+            goodTankU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/GoodTank1.png"));
+            goodTankL = ImageUtil.rotateImage(goodTankU, -90);
+            goodTankR = ImageUtil.rotateImage(goodTankU, 90);
+            goodTankD = ImageUtil.rotateImage(goodTankU, 180);
 
-            BadTankU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/BadTank1.png"));
-            BadTankL = ImageUtil.rotateImage(BadTankU, -90);
-            BadTankR = ImageUtil.rotateImage(BadTankU, 90);
-            BadTankD = ImageUtil.rotateImage(BadTankU, 180);
+            badTankU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/BadTank1.png"));
+            badTankL = ImageUtil.rotateImage(badTankU, -90);
+            badTankR = ImageUtil.rotateImage(badTankU, 90);
+            badTankD = ImageUtil.rotateImage(badTankU, 180);
 
             bulletU = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/bulletU.png"));
             bulletL = ImageUtil.rotateImage(bulletU, -90);

src/main/java/com/example/tankbattle/Tank.java

@@ -1,83 +1,66 @@
 package com.example.tankbattle;
 
-import com.example.tankbattle.net.BulletNewMessage;
-import com.example.tankbattle.net.Client;
-import com.example.tankbattle.net.TankJoinMessage;
+import com.example.tankbattle.strategy.DefaultFireStrategy;
+import com.example.tankbattle.strategy.FireStrategy;
 
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.util.Random;
-import java.util.UUID;
 
-public class Tank {
+public class Tank extends GameObject{
     private static final int SPEED = 2;
 
-    public static int WIDTH = ResourceMgr.GoodTankD.getWidth();
-    public static int HEIGHT = ResourceMgr.GoodTankD.getHeight();
+    public static int WIDTH = ResourceMgr.goodTankU.getWidth();
+    public static int HEIGHT = ResourceMgr.goodTankU.getHeight();
 
-    private UUID id = UUID.randomUUID();
     Rectangle rect = new Rectangle();
 
     private Random random = new Random();
 
-    private int x,y;
+    public Dir dir = Dir.DOWN;
 
-    private Dir dir = Dir.DOWN;
-
-    private boolean moving = false;
-
-    private TankFrame tf = null;
+    private boolean moving = true;
 
     private boolean living = true;
 
-    private Group group = Group.BAD;
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
+    public Group group = Group.BAD;
 
-    public Tank(TankJoinMessage message) {
-        this.x = message.x;
-        this.y = message.y;
-        this.dir = message.dir;
-        this.moving = message.moving;
-        this.group = message.group;
-        this.id = message.id;
+    int oldX, oldY;
 
-        rect.x = this.x;
-        rect.y = this.y;
-        rect.width = WIDTH;
-        rect.height = HEIGHT;
-    }
+    FireStrategy fs;
 
-    public Tank(int x, int y, Dir dir, Group group, TankFrame tf) {
+    public Tank(int x, int y, Dir dir, Group group) {
         super();
         this.x = x;
         this.y = y;
         this.dir = dir;
         this.group = group;
-        this.tf = tf;
 
         rect.x = this.x;
         rect.y = this.y;
         rect.width = WIDTH;
         rect.height = HEIGHT;
+
+        if(group == Group.GOOD) {
+            String goodFSName = PropertyMgr.get("goodFS");
+
+            try {
+                fs = (FireStrategy)Class.forName(goodFSName).getDeclaredConstructor().newInstance();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            fs = new DefaultFireStrategy();
+        }
+        GameModel.getInstance().add(this);
+    }
+
+    public Rectangle getRect() {
+        return rect;
     }
 
     public void fire(){
-        int bX = this.x + Tank.WIDTH / 2 - Bullet.WIDTH / 2;
-        int bY = this.y + Tank.HEIGHT / 2 - Bullet.HEIGHT / 2;
-        Bullet bullet = new Bullet(this.id, bX, bY, this.dir, this.group, this.tf);
-        tf.bullets.add(bullet);
-        Client.INSTANCE.send(new BulletNewMessage(bullet));
-        if (this.group == Group.GOOD) {
-            new Thread(() -> new Audio("audio/tank_fire.wav").play()).start();
-        }
+        fs.fire(this);
     }
 
     public Dir getDir() {
@@ -105,7 +88,9 @@ public class Tank {
     }
 
     private void move() {
-        if (!living) return;
+        oldX = x;
+        oldY = y;
+
         if (!moving) return;
         switch (dir) {
             case LEFT:
@@ -124,14 +109,11 @@ public class Tank {
                 break;
         }
 
-
-        if (this.group == Group.BAD && random.nextInt(100) > 95) {
+        if (this.group == Group.BAD && random.nextInt(100) > 95)
             this.fire();
-        }
 
-        if (this.group == Group.BAD && random.nextInt(100) > 95) {
+        if (this.group == Group.BAD && random.nextInt(100) > 95)
             randomDir();
-        }
 
         boundsCheck();
         rect.x = this.x;
@@ -139,55 +121,33 @@ public class Tank {
     }
 
     private void boundsCheck() {
-        if (this.x < 2) {
-            this.x = 2;
-        }
-        if (this.y < 28) {
-            this.y = 28;
-        }
+        if (this.x < 2) x = 2;
+        if (this.y < 28) y = 28;
 
-        if (this.x > TankFrame.GAME_WIDTH - Tank.WIDTH - 2) {
-            this.x = TankFrame.GAME_WIDTH - Tank.WIDTH - 2;
-        }
-        if (this.y > TankFrame.GAME_HEIGHT - Tank.HEIGHT - 2) {
-            this.y = TankFrame.GAME_HEIGHT - Tank.HEIGHT - 2;
-        }
+        if (this.x > TankFrame.GAME_WIDTH - Tank.WIDTH - 2) x = TankFrame.GAME_WIDTH - Tank.WIDTH - 2;
+        if (this.y > TankFrame.GAME_HEIGHT - Tank.HEIGHT - 2) y = TankFrame.GAME_HEIGHT - Tank.HEIGHT - 2;
     }
 
     private void randomDir() {
         this.dir = Dir.values()[random.nextInt(4)];
     }
 
+
+    @Override
     public void paint(Graphics g) {
-//        if (!living) {
-//            tf.tanks.remove(this);
-//        }
-        Color color = g.getColor();
-        g.setColor(Color.YELLOW);
-        g.drawString(id.toString(), this.x, this.y - 20);
-        g.drawString("live=" + living, x, y - 10);
-        g.setColor(color);
-
-        if (!living) {
-            moving = false;
-            Color colorc = g.getColor();
-            g.setColor(Color.WHITE);
-            g.drawRect(x, y, WIDTH, HEIGHT);
-            g.setColor(colorc);
-            return;
-        }
+        if (!living) GameModel.getInstance().remove(this);
         switch (dir) {
             case LEFT:
-                g.drawImage(this.group == Group.GOOD ? ResourceMgr.GoodTankL : ResourceMgr.BadTankL, x, y, null);
+                g.drawImage(this.group == Group.GOOD ? ResourceMgr.goodTankL : ResourceMgr.badTankL, x, y, null);
                 break;
             case UP:
-                g.drawImage(this.group == Group.GOOD ? ResourceMgr.GoodTankU : ResourceMgr.BadTankU, x, y, null);
+                g.drawImage(this.group == Group.GOOD ? ResourceMgr.goodTankU : ResourceMgr.badTankU, x, y, null);
                 break;
             case RIGHT:
-                g.drawImage(this.group == Group.GOOD ? ResourceMgr.GoodTankR : ResourceMgr.BadTankR, x, y, null);
+                g.drawImage(this.group == Group.GOOD ? ResourceMgr.goodTankR : ResourceMgr.badTankR, x, y, null);
                 break;
             case DOWN:
-                g.drawImage(this.group == Group.GOOD ? ResourceMgr.GoodTankD : ResourceMgr.BadTankD, x, y, null);
+                g.drawImage(this.group == Group.GOOD ? ResourceMgr.goodTankD : ResourceMgr.badTankD, x, y, null);
                 break;
             default:
                 break;
@@ -195,6 +155,16 @@ public class Tank {
         move();
     }
 
+    @Override
+    public int getWidth() {
+        return 0;
+    }
+
+    @Override
+    public int getHeight() {
+        return 0;
+    }
+
     public void setDir(Dir dir) {
         this.dir = dir;
     }
@@ -207,24 +177,21 @@ public class Tank {
         this.x = x;
     }
 
-    public boolean isLiving() {
-        return living;
-    }
-
-    public void setLiving(boolean living) {
-        this.living = living;
-    }
-
     public void setY(int y) {
         this.y = y;
     }
 
     public void die() {
         this.living = false;
-        int eX = this.getX() + Tank.WIDTH / 2 - Explode.WIDTH / 2;
-        int eY = this.getY() + Tank.HEIGHT / 2 - Explode.HEIGHT / 2;
-        TankFrame.INSTANCE.explodes.add(new Explode(eX, eY));
     }
 
+    public void stop() {
+        this.moving = false;
+    }
+
+    public void back() {
+        x = oldX;
+        y = oldY;
+    }
 
 }

src/main/java/com/example/tankbattle/TankFrame.java

@@ -1,10 +1,5 @@
 package com.example.tankbattle;
 
-import com.example.tankbattle.net.Client;
-import com.example.tankbattle.net.TankDirChangedMessage;
-import com.example.tankbattle.net.TankStartMovingMessage;
-import com.example.tankbattle.net.TankStopMessage;
-
 import java.awt.Color;
 import java.awt.Frame;
 import java.awt.Graphics;
@@ -13,55 +8,19 @@ import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
 
 public class TankFrame extends Frame {
 
-    public static final TankFrame INSTANCE = new TankFrame();
-
-    Random random = new Random();
-
-    Tank myTank = new Tank(random.nextInt(GAME_WIDTH), random.nextInt(GAME_HEIGHT), Dir.DOWN, Group.GOOD, this);
-
-    List<Bullet> bullets = new ArrayList<>();
-    Map<UUID, Tank> tanks = new HashMap<>();
-    List<Explode> explodes = new ArrayList<>();
-
+    GameModel gm = GameModel.getInstance();
 
     static final int GAME_WIDTH = Integer.valueOf(PropertyMgr.get("gameWidth"));
     static final int GAME_HEIGHT = Integer.valueOf(PropertyMgr.get("gameHeight"));
 
-    public void addBullet(Bullet bullet) {
-        bullets.add(bullet);
-    }
-
-    public void addTank(Tank tank) {
-        tanks.put(tank.getId(), tank);
-    }
-
-    public Tank findTankByUUID(UUID id){
-        return tanks.get(id);
-    }
-
-    public Bullet findBulletByUUID(UUID id) {
-        for (int i = 0; i < bullets.size(); i++) {
-            if (bullets.get(i).getId().equals(id)) {
-                return bullets.get(i);
-            }
-        }
-        return null;
-    }
-
-	private TankFrame() {
+	public TankFrame() {
         setSize(GAME_WIDTH, GAME_HEIGHT);
         setResizable(false);
         setTitle("tank battle");
+        setVisible(true);
         this.addKeyListener(new MyKeyListener());
         addWindowListener(new WindowAdapter() {
             @Override
@@ -88,33 +47,7 @@ public class TankFrame extends Frame {
 
     @Override
     public void paint(Graphics g) {
-        Color c = g.getColor();
-        g.setColor(Color.WHITE);
-        g.drawString("子弹的数量:" + bullets.size(), 10, 60);
-        g.drawString("敌方坦克的数量:" + tanks.size(), 10, 80);
-        g.drawString("爆炸的数量:" + explodes.size(), 10, 100);
-        g.setColor(c);
-
-        myTank.paint(g);
-        for (int i = 0; i < bullets.size(); i++) {
-            bullets.get(i).paint(g);
-        }
-
-        tanks.values().stream().forEach((e) -> e.paint(g));
-
-        for (int i = 0; i < explodes.size(); i++) {
-            explodes.get(i).paint(g);
-        }
-        Collection<Tank> values = tanks.values();
-        for (int i = 0; i < bullets.size(); i++) {
-            for (Tank value : values) {
-                bullets.get(i).collideWith(value);
-            }
-        }
-//        for (Iterator<Bullet> it = bullets.iterator(); it.hasNext()) {
-//            Bullet b = it.next();
-//            if (!b.live) it.remove();
-//        }
+        gm.paint(g);
     }
 
 
@@ -131,24 +64,21 @@ public class TankFrame extends Frame {
             switch (key) {
                 case KeyEvent.VK_LEFT:
                     bL = true;
-                    setMainTankDir();
                     break;
                 case KeyEvent.VK_UP:
                     bU = true;
-                    setMainTankDir();
                     break;
                 case KeyEvent.VK_RIGHT:
                     bR = true;
-                    setMainTankDir();
                     break;
                 case KeyEvent.VK_DOWN:
                     bD = true;
-                    setMainTankDir();
                     break;
                 default:
                     break;
             }
-            new Thread(()->new Audio("audio/tank_move.wav").play()).start();
+
+            setMainTankDir();
         }
 
         @Override
@@ -157,64 +87,39 @@ public class TankFrame extends Frame {
             switch (key) {
                 case KeyEvent.VK_LEFT:
                     bL = false;
-                    setMainTankDir();
                     break;
                 case KeyEvent.VK_UP:
                     bU = false;
-                    setMainTankDir();
                     break;
                 case KeyEvent.VK_RIGHT:
                     bR = false;
-                    setMainTankDir();
                     break;
                 case KeyEvent.VK_DOWN:
                     bD = false;
-                    setMainTankDir();
                     break;
                 case KeyEvent.VK_CONTROL:
-                    myTank.fire();
+                    gm.getMainTank().fire();
                     break;
                 default:
                     break;
             }
+
+            setMainTankDir();
         }
 
         private void setMainTankDir() {
-
-            Dir dir = myTank.getDir();
-
+            Tank myTank = gm.getMainTank();
             if (!bL && !bU && !bR && !bD) {
                 myTank.setMoving(false);
-                Client.INSTANCE.send(new TankStopMessage(getMainTank()));
             } else {
-                if (bL) {
-                    myTank.setDir(Dir.LEFT);
-                }
-                if (bU) {
-                    myTank.setDir(Dir.UP);
-                }
-                if (bR) {
-                    myTank.setDir(Dir.RIGHT);
-                }
-                if (bD) {
-                    myTank.setDir(Dir.DOWN);
-                }
-                if (!myTank.isMoving()) {
-                    Client.INSTANCE.send(new TankStartMovingMessage(getMainTank()));
-                }
-
                 myTank.setMoving(true);
-                if (dir != myTank.getDir()) {
-                    Client.INSTANCE.send(new TankDirChangedMessage(myTank));
-                }
+                if (bL) myTank.setDir(Dir.LEFT);
+                if (bU) myTank.setDir(Dir.UP);
+                if (bR) myTank.setDir(Dir.RIGHT);
+                if (bD) myTank.setDir(Dir.DOWN);
             }
         }
     }
-
-    public Tank getMainTank() {
-        return this.myTank;
-    }
-
 }
 
 

src/main/java/com/example/tankbattle/Wall.java

@@ -0,0 +1,62 @@
+package com.example.tankbattle;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+
+public class Wall extends GameObject{
+
+    int w, h;
+
+    public Rectangle rect;
+
+    public int getW() {
+        return w;
+    }
+
+    public void setW(int w) {
+        this.w = w;
+    }
+
+    public int getH() {
+        return h;
+    }
+
+    public void setH(int h) {
+        this.h = h;
+    }
+
+    public Rectangle getRect() {
+        return rect;
+    }
+
+    public void setRect(Rectangle rect) {
+        this.rect = rect;
+    }
+
+    public Wall(int x, int y, int w, int h) {
+        this.x = x;
+        this.y = y;
+        this.w = w;
+        this.h = h;
+        this.rect = new Rectangle(x, y, w, h);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        Color c = g.getColor();
+        g.setColor(Color.GRAY);
+        g.fillRect(x, y, w, h);
+        g.setColor(c);
+    }
+
+    @Override
+    public int getWidth() {
+        return 0;
+    }
+
+    @Override
+    public int getHeight() {
+        return 0;
+    }
+}

src/main/java/com/example/tankbattle/cor/BulletTankCollider.java

@@ -0,0 +1,26 @@
+package com.example.tankbattle.cor;
+
+import com.example.tankbattle.Bullet;
+import com.example.tankbattle.GameObject;
+import com.example.tankbattle.Tank;
+
+public class BulletTankCollider implements Collider {
+
+
+    @Override
+    public boolean collide(GameObject o1, GameObject o2) {
+        if (o1 instanceof Bullet && o2 instanceof Tank) {
+            Bullet bullet = (Bullet) o1;
+            Tank t = (Tank) o2;
+            if (bullet.collideWith(t)){
+                return false;
+            } else {
+                return true;
+            }
+        } else if (o1 instanceof Tank && o2 instanceof Bullet) {
+            return collide(o2, o1);
+        } else {
+            return true;
+        }
+    }
+}

src/main/java/com/example/tankbattle/cor/BulletWallCollider.java

@@ -0,0 +1,25 @@
+package com.example.tankbattle.cor;
+
+import com.example.tankbattle.Bullet;
+import com.example.tankbattle.GameObject;
+import com.example.tankbattle.Wall;
+
+public class BulletWallCollider implements Collider {
+
+    @Override
+    public boolean collide(GameObject o1, GameObject o2) {
+        if (o1 instanceof Bullet && o2 instanceof Wall) {
+            Bullet bullet = (Bullet) o1;
+            Wall wall = (Wall) o2;
+            if (bullet.getRect().intersects(wall.getRect())) {
+                System.out.println("bullet die");
+                bullet.die();
+            } else if (o1 instanceof Wall && o2 instanceof Bullet) {
+                return collide(o2, o1);
+            }
+        } else {
+            System.out.println(o1.getClass().getName() + "   " + o2.getClass().getName());
+        }
+        return true;
+    }
+}

src/main/java/com/example/tankbattle/cor/Collider.java

@@ -0,0 +1,7 @@
+package com.example.tankbattle.cor;
+
+import com.example.tankbattle.GameObject;
+
+public interface Collider {
+    boolean collide(GameObject o1, GameObject o2);
+}

src/main/java/com/example/tankbattle/cor/ColliderChain.java

@@ -0,0 +1,32 @@
+package com.example.tankbattle.cor;
+
+import com.example.tankbattle.GameObject;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class ColliderChain implements Collider {
+
+    private List<Collider> colliders = new LinkedList<>();
+
+    public ColliderChain() {
+        add(new BulletTankCollider());
+        add(new TankTankCollider());
+        add(new BulletWallCollider());
+        add(new TankWallCollider());
+    }
+
+    public void add(Collider c) {
+        colliders.add(c);
+    }
+
+    @Override
+    public boolean collide(GameObject o1, GameObject o2) {
+        for (int i = 0; i < colliders.size(); i++) {
+            if (!colliders.get(i).collide(o1, o2)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}

src/main/java/com/example/tankbattle/cor/TankTankCollider.java

@@ -0,0 +1,23 @@
+package com.example.tankbattle.cor;
+
+import com.example.tankbattle.GameObject;
+import com.example.tankbattle.Tank;
+
+public class TankTankCollider implements Collider {
+
+
+    @Override
+    public boolean collide(GameObject o1, GameObject o2) {
+        if (o1 instanceof Tank && o2 instanceof Tank) {
+            Tank t1 = (Tank) o1;
+            Tank t2 = (Tank) o2;
+            if ( t1.getRect().intersects(t2.getRect())){
+//                t1.stop();
+//                t2.stop();
+                t1.back();
+                t2.back();
+            }
+        }
+        return true;
+    }
+}

src/main/java/com/example/tankbattle/cor/TankWallCollider.java

@@ -0,0 +1,23 @@
+package com.example.tankbattle.cor;
+
+import com.example.tankbattle.GameObject;
+import com.example.tankbattle.Tank;
+import com.example.tankbattle.Wall;
+
+public class TankWallCollider implements Collider {
+
+
+    @Override
+    public boolean collide(GameObject o1, GameObject o2) {
+        if (o1 instanceof Tank && o2 instanceof Wall) {
+            Tank tank = (Tank) o1;
+            Wall wall = (Wall) o2;
+            if (tank.getRect().intersects(wall.getRect())) {
+                tank.back();
+            } else if (o1 instanceof Wall && o2 instanceof Tank) {
+                return collide(o2, o1);
+            }
+        }
+        return true;
+    }
+}

src/main/java/com/example/tankbattle/decorator/GODecorator.java

@@ -0,0 +1,31 @@
+package com.example.tankbattle.decorator;
+
+import com.example.tankbattle.GameObject;
+
+import java.awt.Graphics;
+
+public class GODecorator extends GameObject {
+    GameObject gameObject;
+
+    public GODecorator(GameObject gameObject) {
+        this.gameObject = gameObject;
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        this.x = gameObject.x;
+        this.y = gameObject.y;
+        paint(g);
+        gameObject.paint(g);
+    }
+
+    @Override
+    public int getWidth() {
+        return 0;
+    }
+
+    @Override
+    public int getHeight() {
+        return 0;
+    }
+}

src/main/java/com/example/tankbattle/decorator/RectDecorator.java

@@ -0,0 +1,37 @@
+package com.example.tankbattle.decorator;
+
+import com.example.tankbattle.GameObject;
+
+import java.awt.Color;
+import java.awt.Graphics;
+
+public class RectDecorator extends GameObject {
+    GameObject gameObject;
+
+    public RectDecorator(GameObject gameObject) {
+        this.gameObject = gameObject;
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        this.x = gameObject.x;
+        this.y = gameObject.y;
+
+        gameObject.paint(g);
+
+        Color c = g.getColor();
+        g.setColor(Color.YELLOW);
+        g.drawRect(x, y, gameObject.getWidth(), gameObject.getHeight());
+        g.setColor(c);
+    }
+
+    @Override
+    public int getWidth() {
+        return 0;
+    }
+
+    @Override
+    public int getHeight() {
+        return 0;
+    }
+}

src/main/java/com/example/tankbattle/demo/Cat.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 
 public class Cat implements CustomComparable<Cat> {

src/main/java/com/example/tankbattle/demo/CustomComparable.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public interface CustomComparable<T> {
     int compareTo(T o);

src/main/java/com/example/tankbattle/demo/CustomComparator.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public interface CustomComparator<T> {
     int compare(T o1, T o2);

src/main/java/com/example/tankbattle/demo/Dog.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public class Dog implements CustomComparable<Dog> {
 

src/main/java/com/example/tankbattle/demo/DogComparator.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public class DogComparator implements CustomComparator<Dog> {
 

src/main/java/com/example/tankbattle/demo/Main.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 import java.util.Arrays;
 

src/main/java/com/example/tankbattle/demo/Sorter.java

@@ -1,4 +1,4 @@
-package com.example.tankbattle.strategy;
+package com.example.tankbattle.demo;
 
 public class Sorter<T> {
 

src/main/java/com/example/tankbattle/net/BulletNewMessage.java

@@ -1,96 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Bullet;
-import com.example.tankbattle.Dir;
-import com.example.tankbattle.Group;
-import com.example.tankbattle.TankFrame;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-public class BulletNewMessage extends Message {
-    UUID playerID;
-    UUID id;
-    int x, y;
-    Dir dir;
-    Group group;
-
-    public BulletNewMessage() {
-    }
-
-    public BulletNewMessage(Bullet bullet) {
-        this.playerID = bullet.getPlayerId();
-        this.id = bullet.getId();
-        this.x = bullet.getX();
-        this.y = bullet.getY();
-        this.dir = bullet.getDir();
-        this.group = bullet.getGroup();
-    }
-
-    @Override
-    public void handle() {
-        if (this.playerID.equals(TankFrame.INSTANCE.getMainTank().getId())) {
-            return;
-        }
-        Bullet bullet = new Bullet(this.playerID, x, y, dir, group, TankFrame.INSTANCE);
-        bullet.setId(this.id);
-        TankFrame.INSTANCE.addBullet(bullet);
-    }
-
-    @Override
-    public byte[] toBytes() {
-        byte[] bytes = null;
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             DataOutputStream dos = new DataOutputStream(baos)) {
-            dos.writeLong(this.playerID.getMostSignificantBits());
-            dos.writeLong(this.playerID.getLeastSignificantBits());
-            dos.writeLong(id.getMostSignificantBits());
-            dos.writeLong(id.getLeastSignificantBits());
-            dos.writeInt(x);
-            dos.writeInt(y);
-            dos.writeInt(dir.ordinal());
-            dos.writeInt(group.ordinal());
-            dos.flush();
-            bytes = baos.toByteArray();
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return bytes;
-    }
-
-    @Override
-    public void parse(byte[] bytes) {
-        try (DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bytes))) {
-            this.playerID = new UUID(dis.readLong(), dis.readLong());
-            this.id = new UUID(dis.readLong(), dis.readLong());
-
-            this.x = dis.readInt();
-            this.y = dis.readInt();
-            this.dir = Dir.values()[dis.readInt()];
-            this.group = Group.values()[dis.readInt()];
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        }
-    }
-
-    @Override
-    public MessageType getMessageType() {
-        return MessageType.BulletNew;
-    }
-
-    @Override
-    public String toString() {
-        return "BulletNewMessage{" +
-                "playerID=" + playerID +
-                ", id=" + id +
-                ", x=" + x +
-                ", y=" + y +
-                ", dir=" + dir +
-                ", group=" + group +
-                '}';
-    }
-}

src/main/java/com/example/tankbattle/net/Client.java

@@ -1,53 +0,0 @@
-package com.example.tankbattle.net;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioSocketChannel;
-
-public class Client {
-    public static final Client INSTANCE = new Client();
-
-    private Client() {
-    }
-
-    private Channel channel;
-    public void connect() {
-        EventLoopGroup group = new NioEventLoopGroup(1);
-        Bootstrap bootstrap = new Bootstrap();
-
-        try {
-            ChannelFuture channelFuture = bootstrap.group(group).channel(NioSocketChannel.class).handler(new ClientChannelInitializer())
-                    .connect("localhost", 8888);
-            channelFuture.addListener(new ChannelFutureListener() {
-                @Override
-                public void operationComplete(ChannelFuture future) throws Exception {
-                    if (!future.isSuccess()) {
-                        System.out.println("not connected");
-                    } else {
-                        System.out.println("connected");
-                        channel = future.channel();
-                    }
-                }
-            });
-            channelFuture.sync();
-            channelFuture.channel().closeFuture().sync();
-            System.out.println("connection closed");
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } finally {
-            group.shutdownGracefully();
-        }
-    }
-
-    public void send(Message message) {
-        System.out.println("send " + message.toString());
-        channel.writeAndFlush(message);
-    }
-
-    public void closeConnect(){
-    }
-}

src/main/java/com/example/tankbattle/net/ClientChannelInitializer.java

@@ -1,15 +0,0 @@
-package com.example.tankbattle.net;
-
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.socket.SocketChannel;
-
-public class ClientChannelInitializer extends ChannelInitializer<SocketChannel> {
-
-    @Override
-    protected void initChannel(SocketChannel socketChannel) throws Exception {
-        socketChannel.pipeline()
-                .addLast(new MessageEncoder())
-                .addLast(new MessageDecoder())
-                .addLast(new ClientHandler());
-    }
-}

src/main/java/com/example/tankbattle/net/ClientHandler.java

@@ -1,18 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.TankFrame;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
-public class ClientHandler extends SimpleChannelInboundHandler<Message> {
-    @Override
-    public void channelRead0(ChannelHandlerContext ctx, Message msg) throws Exception {
-        System.out.println(msg);
-        msg.handle();
-    }
-
-    @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        ctx.writeAndFlush(new TankJoinMessage(TankFrame.INSTANCE.getMainTank()));
-    }
-}

src/main/java/com/example/tankbattle/net/Message.java

@@ -1,8 +0,0 @@
-package com.example.tankbattle.net;
-
-public abstract class Message {
-    public abstract void handle();
-    public abstract byte[] toBytes();
-    public abstract void parse(byte[] bytes);
-    public abstract MessageType getMessageType();
-}

src/main/java/com/example/tankbattle/net/MessageDecoder.java

@@ -1,30 +0,0 @@
-package com.example.tankbattle.net;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.ByteToMessageDecoder;
-
-import java.util.List;
-
-public class MessageDecoder extends ByteToMessageDecoder {
-    @Override
-    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
-        if (in.readableBytes() < 8) {
-            return;
-        }
-        in.markReaderIndex();
-        MessageType messageType = MessageType.values()[in.readInt()];
-        int length = in.readInt();
-        if (in.readableBytes() < length) {
-            in.resetReaderIndex();
-            return;
-        }
-
-        byte[] bytes = new byte[length];
-        in.readBytes(bytes);
-
-        Message message = (Message) Class.forName("com.example.tankbattle.net." + messageType.toString() + "Message").getDeclaredConstructor().newInstance();
-        message.parse(bytes);
-        out.add(message);
-    }
-}

src/main/java/com/example/tankbattle/net/MessageEncoder.java

@@ -1,16 +0,0 @@
-package com.example.tankbattle.net;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToByteEncoder;
-
-public class MessageEncoder extends MessageToByteEncoder<Message> {
-
-    @Override
-    protected void encode(ChannelHandlerContext ctx, Message msg, ByteBuf out) throws Exception {
-        out.writeInt(msg.getMessageType().ordinal());
-        byte[] data = msg.toBytes();
-        out.writeInt(data.length);
-        out.writeBytes(data);
-    }
-}

src/main/java/com/example/tankbattle/net/MessageType.java

@@ -1,5 +0,0 @@
-package com.example.tankbattle.net;
-
-public enum MessageType {
-    TankJoin, TankDirChanged, TankStop, TankStartMoving, BulletNew, TankDie,
-}

src/main/java/com/example/tankbattle/net/Server.java

@@ -1,44 +0,0 @@
-package com.example.tankbattle.net;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.group.ChannelGroup;
-import io.netty.channel.group.DefaultChannelGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.util.concurrent.GlobalEventExecutor;
-
-public class Server {
-    public static ChannelGroup clients = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
-
-    public void serverStart() {
-        EventLoopGroup bossGroup = new NioEventLoopGroup(1);
-        EventLoopGroup workerGroup = new NioEventLoopGroup(2);
-        try {
-            ServerBootstrap bootstrap = new ServerBootstrap();
-            ChannelFuture channelFuture = bootstrap.group(bossGroup, workerGroup)
-                    .channel(NioServerSocketChannel.class)
-                    .childHandler(new ChannelInitializer<SocketChannel>() {
-                        @Override
-                        protected void initChannel(SocketChannel ch) throws Exception {
-                            ChannelPipeline channelPipeline = ch.pipeline();
-                            channelPipeline.addLast(new MessageEncoder())
-                                    .addLast(new MessageDecoder())
-                                    .addLast(new ServerChildHandler());
-                        }
-                    }).bind(8888).sync();
-
-            ServerFrame.INSTANCE.updateServerMessage("server started!");
-            channelFuture.channel().closeFuture().sync();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            workerGroup.shutdownGracefully();
-            bossGroup.shutdownGracefully();
-        }
-    }
-}

src/main/java/com/example/tankbattle/net/ServerChildHandler.java

@@ -1,48 +0,0 @@
-package com.example.tankbattle.net;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-
-public class ServerChildHandler extends ChannelInboundHandlerAdapter {
-
-    @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        Server.clients.add(ctx.channel());
-    }
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-        ServerFrame.INSTANCE.updateClientMessage(msg.toString());
-        Server.clients.writeAndFlush(msg);
-
-		/*ByteBuf buf = null;
-		try {
-			buf = (ByteBuf)msg;
-
-			byte[] bytes = new byte[buf.readableBytes()];
-			buf.getBytes(buf.readerIndex(), bytes);
-			String s = new String(bytes);
-
-			if(s.equals("_bye_")) {
-				System.out.println("<22>ͻ<EFBFBD><CDBB><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD>˳<EFBFBD>");
-				Server.clients.remove(ctx.channel());
-				ctx.close();
-			} else {
-				Server.clients.writeAndFlush(msg);
-			}*/
-
-        //System.out.println(buf);
-        //System.out.println(buf.refCnt());
-		/*} finally {
-			//if(buf != null && buf) ReferenceCountUtil.release(buf);
-			//System.out.println(buf.refCnt());
-		}*/
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        cause.printStackTrace();
-        Server.clients.remove(ctx.channel());
-        ctx.close();
-    }
-}

src/main/java/com/example/tankbattle/net/ServerFrame.java

@@ -1,51 +0,0 @@
-package com.example.tankbattle.net;
-
-import java.awt.BorderLayout;
-import java.awt.Button;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridLayout;
-import java.awt.Panel;
-import java.awt.TextArea;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-public class ServerFrame extends Frame {
-    public static final ServerFrame INSTANCE = new ServerFrame();
-    Button btnStart = new Button("start");
-    TextArea textLeft = new TextArea();
-    TextArea textRight = new TextArea();
-    Server server = new Server();
-
-    public ServerFrame() {
-        this.setSize(1600, 600);
-        this.setLocation(300, 30);
-        this.add(btnStart, BorderLayout.NORTH);
-        Panel panel = new Panel(new GridLayout(1, 2));
-        panel.add(textLeft);
-        panel.add(textRight);
-        this.add(panel);
-        textLeft.setFont(new Font("verderna", Font.PLAIN, 25));
-
-        this.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e) {
-                System.exit(0);
-            }
-        });
-    }
-
-    public static void main(String[] args) {
-        ServerFrame.INSTANCE.setVisible(true);
-        ServerFrame.INSTANCE.server.serverStart();
-    }
-
-    public void updateServerMessage(String message) {
-        this.textLeft.setText(textLeft.getText() + message + System.lineSeparator());
-    }
-
-    public void updateClientMessage(String message) {
-        this.textRight.setText(textRight.getText() + message + System.lineSeparator());
-
-    }
-}

src/main/java/com/example/tankbattle/net/TankDieMessage.java

@@ -1,96 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Bullet;
-import com.example.tankbattle.Tank;
-import com.example.tankbattle.TankFrame;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-public class TankDieMessage extends Message{
-
-    UUID bulletId;
-    UUID id;
-
-    public TankDieMessage() {
-    }
-
-    public TankDieMessage(UUID playerId, UUID id) {
-        this.bulletId = playerId;
-        this.id = id;
-    }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    @Override
-    public void handle() {
-        System.out.println("we got a tank die: " + id);
-        System.out.println("and my tank is: " + TankFrame.INSTANCE.getMainTank().getId());
-        Tank tank = TankFrame.INSTANCE.findTankByUUID(id);
-        System.out.println("i found a tank with this id: " + tank);
-
-        Bullet bullet = TankFrame.INSTANCE.findBulletByUUID(bulletId);
-        if (bullet != null) {
-            bullet.die();
-        }
-        if (this.id.equals(TankFrame.INSTANCE.getMainTank().getId())) {
-            TankFrame.INSTANCE.getMainTank().die();
-        } else {
-            Tank tanka = TankFrame.INSTANCE.findTankByUUID(id);
-            if (tanka != null) {
-                tanka.die();
-            }
-        }
-    }
-
-    @Override
-    public byte[] toBytes() {
-        byte[] bytes = null;
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             DataOutputStream dos = new DataOutputStream(baos)) {
-            dos.writeLong(bulletId.getMostSignificantBits());
-            dos.writeLong(bulletId.getLeastSignificantBits());
-            dos.writeLong(id.getMostSignificantBits());
-            dos.writeLong(id.getLeastSignificantBits());
-            dos.flush();
-            bytes = baos.toByteArray();
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return bytes;
-    }
-
-    @Override
-    public void parse(byte[] bytes) {
-        try (DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bytes))) {
-            this.bulletId = new UUID(dis.readLong(), dis.readLong());
-            this.id = new UUID(dis.readLong(), dis.readLong());
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        }
-    }
-
-    @Override
-    public MessageType getMessageType() {
-        return MessageType.TankDie;
-    }
-
-    @Override
-    public String toString() {
-        return "TankDieMessage{" +
-                "bulletId=" + bulletId +
-                ", id=" + id +
-                '}';
-    }
-}

src/main/java/com/example/tankbattle/net/TankDirChangedMessage.java

@@ -1,132 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Dir;
-import com.example.tankbattle.Tank;
-import com.example.tankbattle.TankFrame;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-public class TankDirChangedMessage extends Message{
-
-    UUID id;
-
-    Dir dir;
-
-    int x, y;
-
-    public TankDirChangedMessage() {
-    }
-
-    public TankDirChangedMessage(UUID id, int x, int y , Dir dir) {
-        super();
-        this.id = id;
-        this.x = x;
-        this.y = y;
-        this.dir = dir;
-    }
-
-    public TankDirChangedMessage(Tank tank) {
-        this.id = tank.getId();
-        this.dir = tank.getDir();
-        this.x = tank.getX();
-        this.y = tank.getY();
-    }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.x = x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public void setY(int y) {
-        this.y = y;
-    }
-
-    public Dir getDir() {
-        return dir;
-    }
-
-    public void setDir(Dir dir) {
-        this.dir = dir;
-    }
-
-    @Override
-    public void handle() {
-        if (this.id.equals(TankFrame.INSTANCE.getMainTank().getId())) {
-            return;
-        }
-        Tank tank = TankFrame.INSTANCE.findTankByUUID(this.id);
-        if (tank != null) {
-            tank.setMoving(true);
-            tank.setX(this.x);
-            tank.setY(this.y);
-            tank.setDir(this.dir);
-        }
-    }
-
-    @Override
-    public byte[] toBytes() {
-        byte[] bytes = null;
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             DataOutputStream dos = new DataOutputStream(baos)) {
-            dos.writeLong(id.getMostSignificantBits());
-            dos.writeLong(id.getLeastSignificantBits());
-            dos.writeInt(x);
-            dos.writeInt(y);
-            dos.writeInt(dir.ordinal());
-            dos.flush();
-            bytes = baos.toByteArray();
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return bytes;
-    }
-
-    @Override
-    public void parse(byte[] bytes) {
-        try (DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bytes))) {
-            this.id = new UUID(dis.readLong(), dis.readLong());
-
-            this.x = dis.readInt();
-            this.y = dis.readInt();
-            this.dir = Dir.values()[dis.readInt()];
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        }
-    }
-
-    @Override
-    public MessageType getMessageType() {
-        return MessageType.TankDirChanged;
-    }
-
-    @Override
-    public String toString() {
-        return "TankDirChangedMessage{" +
-                "id=" + id +
-                ", dir=" + dir +
-                ", x=" + x +
-                ", y=" + y +
-                '}';
-    }
-}

src/main/java/com/example/tankbattle/net/TankJoinMessage.java

@@ -1,109 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Dir;
-import com.example.tankbattle.Group;
-import com.example.tankbattle.Tank;
-import com.example.tankbattle.TankFrame;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-public class TankJoinMessage extends Message{
-    public int x;
-    public int y;
-    public Dir dir;
-    public boolean moving;
-    public Group group;
-    public UUID id;
-
-    public TankJoinMessage() {
-    }
-
-    public TankJoinMessage(int x, int y, Dir dir, boolean moving, Group group, UUID id) {
-        super();
-        this.x = x;
-        this.y = y;
-        this.dir = dir;
-        this.moving = moving;
-        this.group = group;
-        this.id = id;
-    }
-
-    public TankJoinMessage(Tank tank) {
-        this.x = tank.getX();
-        this.y = tank.getY();
-        this.dir = tank.getDir();
-        this.group = tank.getGroup();
-        this.moving = tank.isMoving();
-        this.id = tank.getId();
-    }
-
-    @Override
-    public void parse(byte[] bytes) {
-        try (DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bytes))) {
-
-            this.x = dis.readInt();
-            this.y = dis.readInt();
-            this.dir = Dir.values()[dis.readInt()];
-            this.moving = dis.readBoolean();
-            this.group = Group.values()[dis.readInt()];
-            this.id = new UUID(dis.readLong(), dis.readLong());
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        }
-    }
-
-    @Override
-    public byte[] toBytes() {
-
-        byte[] bytes = null;
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             DataOutputStream dos = new DataOutputStream(baos)) {
-            dos.writeInt(x);
-            dos.writeInt(y);
-            dos.writeInt(dir.ordinal());
-            dos.writeBoolean(moving);
-            dos.writeInt(group.ordinal());
-            dos.writeLong(id.getMostSignificantBits());
-            dos.writeLong(id.getLeastSignificantBits());
-            dos.flush();
-            bytes = baos.toByteArray();
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return bytes;
-    }
-
-    @Override
-    public void handle() {
-        if (this.id.equals(TankFrame.INSTANCE.getMainTank().getId()) ||
-                TankFrame.INSTANCE.findTankByUUID(this.id) != null) {
-            return;
-        }
-        Tank tank = new Tank(this);
-        TankFrame.INSTANCE.addTank(tank);
-        Client.INSTANCE.send(new TankJoinMessage(TankFrame.INSTANCE.getMainTank()));
-    }
-
-    @Override
-    public MessageType getMessageType() {
-        return MessageType.TankJoin;
-    }
-
-    @Override
-    public String toString() {
-        return "TankJoinMessage{" +
-                "x=" + x +
-                ", y=" + y +
-                ", dir=" + dir +
-                ", moving=" + moving +
-                ", group=" + group +
-                ", id=" + id +
-                '}';
-    }
-}

src/main/java/com/example/tankbattle/net/TankStartMovingMessage.java

@@ -1,131 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Dir;
-import com.example.tankbattle.Tank;
-import com.example.tankbattle.TankFrame;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-public class TankStartMovingMessage extends Message{
-
-    UUID id;
-
-    int x, y;
-
-    Dir dir;
-
-    public TankStartMovingMessage() {
-    }
-
-    public TankStartMovingMessage(UUID id, int x, int y, Dir dir) {
-        this.id = id;
-        this.x = x;
-        this.y = y;
-        this.dir = dir;
-    }
-
-    public TankStartMovingMessage(Tank tank) {
-        this.id = tank.getId();
-        this.x = tank.getX();
-        this.y = tank.getY();
-        this.dir = tank.getDir();
-    }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.x = x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public void setY(int y) {
-        this.y = y;
-    }
-
-    public Dir getDir() {
-        return dir;
-    }
-
-    public void setDir(Dir dir) {
-        this.dir = dir;
-    }
-
-    @Override
-    public void handle() {
-        if (this.id.equals(TankFrame.INSTANCE.getMainTank().getId())) {
-            return;
-        }
-        Tank tank = TankFrame.INSTANCE.findTankByUUID(this.id);
-        if (tank != null) {
-            tank.setMoving(true);
-            tank.setX(this.x);
-            tank.setY(this.y);
-            tank.setDir(this.dir);
-        }
-    }
-
-    @Override
-    public byte[] toBytes() {
-        byte[] bytes = null;
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             DataOutputStream dos = new DataOutputStream(baos)) {
-            dos.writeLong(id.getMostSignificantBits());
-            dos.writeLong(id.getLeastSignificantBits());
-            dos.writeInt(x);
-            dos.writeInt(y);
-            dos.writeInt(dir.ordinal());
-            dos.flush();
-            bytes = baos.toByteArray();
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return bytes;
-    }
-
-    @Override
-    public void parse(byte[] bytes) {
-        try (DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bytes))) {
-            this.id = new UUID(dis.readLong(), dis.readLong());
-
-            this.x = dis.readInt();
-            this.y = dis.readInt();
-            this.dir = Dir.values()[dis.readInt()];
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        }
-    }
-
-    @Override
-    public MessageType getMessageType() {
-        return MessageType.TankStartMoving;
-    }
-
-    @Override
-    public String toString() {
-        return "TankStartMovingMessage{" +
-                "id=" + id +
-                ", x=" + x +
-                ", y=" + y +
-                ", dir=" + dir +
-                '}';
-    }
-}

src/main/java/com/example/tankbattle/net/TankStopMessage.java

@@ -1,115 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Tank;
-import com.example.tankbattle.TankFrame;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
-public class TankStopMessage extends Message{
-
-    UUID id;
-
-    private int x;
-
-    private int y;
-
-    public TankStopMessage() {}
-
-    public TankStopMessage(UUID id, int x, int y) {
-        this.id = id;
-        this.x = x;
-        this.y = y;
-    }
-
-    public TankStopMessage(Tank tank) {
-        this.id = tank.getId();
-        this.x = tank.getX();
-        this.y = tank.getY();
-    }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.x = x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public void setY(int y) {
-        this.y = y;
-    }
-
-    @Override
-    public void handle() {
-        if (this.id.equals(TankFrame.INSTANCE.getMainTank().getId())) {
-            return;
-        }
-        Tank tank = TankFrame.INSTANCE.findTankByUUID(this.id);
-        if (tank != null) {
-            tank.setMoving(false);
-            tank.setX(this.x);
-            tank.setY(this.y);
-        }
-    }
-
-    @Override
-    public byte[] toBytes() {
-        byte[] bytes = null;
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             DataOutputStream dos = new DataOutputStream(baos)) {
-            dos.writeLong(id.getMostSignificantBits());
-            dos.writeLong(id.getLeastSignificantBits());
-            dos.writeInt(x);
-            dos.writeInt(y);
-            dos.flush();
-            bytes = baos.toByteArray();
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return bytes;
-    }
-
-    @Override
-    public void parse(byte[] bytes) {
-        try (DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bytes))) {
-            this.id = new UUID(dis.readLong(), dis.readLong());
-
-            this.x = dis.readInt();
-            this.y = dis.readInt();
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        }
-    }
-
-    @Override
-    public MessageType getMessageType() {
-        return MessageType.TankStop;
-    }
-
-    @Override
-    public String toString() {
-        return "TankStopMessage{" +
-                "id=" + id +
-                ", x=" + x +
-                ", y=" + y +
-                '}';
-    }
-}

src/main/java/com/example/tankbattle/strategy/DefaultFireStrategy.java

@@ -0,0 +1,21 @@
+package com.example.tankbattle.strategy;
+
+import com.example.tankbattle.Audio;
+import com.example.tankbattle.Bullet;
+import com.example.tankbattle.GameModel;
+import com.example.tankbattle.GameObject;
+import com.example.tankbattle.Group;
+import com.example.tankbattle.Tank;
+import com.example.tankbattle.decorator.RectDecorator;
+
+public class DefaultFireStrategy implements FireStrategy{
+
+    @Override
+    public void fire(Tank t) {
+        int bX = t.x + Tank.WIDTH / 2 - Bullet.WIDTH / 2;
+        int bY = t.y + Tank.HEIGHT / 2 - Bullet.HEIGHT / 2;
+        GameModel.getInstance().add(new RectDecorator(new Bullet(bX, bY, t.dir, t.group)));
+
+        if(t.group == Group.GOOD) new Thread(()->new Audio("audio/tank_fire.wav").play()).start();
+    }
+}

src/main/java/com/example/tankbattle/strategy/FireStrategy.java

@@ -0,0 +1,7 @@
+package com.example.tankbattle.strategy;
+
+import com.example.tankbattle.Tank;
+
+public interface FireStrategy {
+    void fire(Tank tank);
+}

src/main/java/com/example/tankbattle/strategy/FourDirFireStrategy.java

@@ -0,0 +1,21 @@
+package com.example.tankbattle.strategy;
+
+import com.example.tankbattle.Audio;
+import com.example.tankbattle.Bullet;
+import com.example.tankbattle.Dir;
+import com.example.tankbattle.Group;
+import com.example.tankbattle.Tank;
+
+public class FourDirFireStrategy implements FireStrategy{
+
+    @Override
+    public void fire(Tank t) {
+        int bX = t.x + Tank.WIDTH / 2 - Bullet.WIDTH / 2;
+        int bY = t.y + Tank.HEIGHT / 2 - Bullet.HEIGHT / 2;
+        Dir[] dirs = Dir.values();
+        for(Dir dir : dirs) {
+            new Bullet(bX, bY, dir, t.group);
+        }
+        if(t.group == Group.GOOD) new Thread(()->new Audio("audio/tank_fire.wav").play()).start();
+    }
+}

src/main/resources/Config.properties

@@ -3,4 +3,9 @@ initTankCount=10
 tankSpeed=5
 bulletSpeed=10
 gameWidth=1080
-gameHeight=720
+gameHeight=720
+#fireStrategy
+goodFS=com.example.tankbattle.strategy.FourDirFireStrategy
+badFS=com.example.tankbattle.strategy.DefaultFireStrategy
+#colliders
+colliders=com.example.tankbattle.cor.BulletTankCollider,com.example.tankbattle.cor.TankTankCollider

src/test/java/com/example/tankbattle/ImageRotateTest.java

@@ -1,42 +0,0 @@
-package com.example.tankbattle;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import javax.imageio.ImageIO;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-class ImageRotateTest {
-
-	@Test
-	void test() {
-		try {
-			BufferedImage tankL = ImageIO.read(ResourceMgr.class.getClassLoader().getResourceAsStream("images/tankL.gif"));
-			tankL = rotateImage(tankL, 90);
-			Assertions.assertNotNull(tankL);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-	
-	public BufferedImage rotateImage(final BufferedImage bufferedimage,
-            final int degree) {
-        int w = bufferedimage.getWidth();
-        int h = bufferedimage.getHeight();
-        int type = bufferedimage.getColorModel().getTransparency();
-        BufferedImage img;
-        Graphics2D graphics2d;
-        (graphics2d = (img = new BufferedImage(w, h, type))
-                .createGraphics()).setRenderingHint(
-                RenderingHints.KEY_INTERPOLATION,
-                RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-        graphics2d.rotate(Math.toRadians(degree), w / 2, h / 2);
-        graphics2d.drawImage(bufferedimage, 0, 0, null);
-        graphics2d.dispose();
-        return img;
-    }
-}

src/test/java/com/example/tankbattle/ImageTest.java

@@ -16,9 +16,10 @@ public class ImageTest {
     public void test(){
         System.out.println(ImageTest.class.getClassLoader());
         try {
-            BufferedImage image = ImageIO.read(new File("/images/bulletD.gif"));
+            BufferedImage image = ImageIO.read(new File("C:/work/javaprojects/Tank_60/src/images/bulletD.gif"));
             assertNotNull(image);
-            BufferedImage image2 = ImageIO.read(ImageTest.class.getClassLoader().getResourceAsStream("src/images/bulletD.gif"));
+            BufferedImage image2 = ImageIO.read(ImageTest.class.getClassLoader().getResourceAsStream("src/images" +
+                    "/bulletD.gif"));
             assertNotNull(image2);
         } catch (IOException exception) {
             exception.printStackTrace();

src/test/java/com/example/tankbattle/net/TankDirChangedMessageCoderTest.java

@@ -1,69 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Dir;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.junit.jupiter.api.Test;
-
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class TankDirChangedMessageCoderTest {
-
-    @Test
-    void encode() {
-        EmbeddedChannel embeddedChannel = new EmbeddedChannel();
-        UUID id = UUID.randomUUID();
-        TankStartMovingMessage message = new TankStartMovingMessage(id, 5, 10, Dir.LEFT);
-        embeddedChannel.pipeline()
-                .addLast(new MessageEncoder());
-
-        embeddedChannel.writeOutbound(message);
-
-        ByteBuf buf = (ByteBuf) embeddedChannel.readOutbound();
-        MessageType messageType = MessageType.values()[buf.readInt()];
-        assertEquals(MessageType.TankStartMoving, messageType);
-
-        int length = buf.readInt();
-        assertEquals(28, length);
-
-        UUID uuid = new UUID(buf.readLong(), buf.readLong());
-        int x = buf.readInt();
-        int y = buf.readInt();
-        int dirOrdinal = buf.readInt();
-        Dir dir = Dir.values()[dirOrdinal];
-
-        assertEquals(5, x);
-        assertEquals(10, y);
-        assertEquals(Dir.LEFT, dir);
-        assertEquals(id, uuid);
-    }
-
-    @Test
-    void testDecoder() {
-        EmbeddedChannel ch = new EmbeddedChannel();
-
-
-        UUID id = UUID.randomUUID();
-        TankStartMovingMessage message = new TankStartMovingMessage(id, 5, 10, Dir.LEFT);
-        ch.pipeline()
-                .addLast(new MessageDecoder());
-
-        ByteBuf buf = Unpooled.buffer();
-        buf.writeInt(MessageType.TankStartMoving.ordinal());
-        byte[] bytes = message.toBytes();
-        buf.writeInt(bytes.length);
-        buf.writeBytes(bytes);
-
-        ch.writeInbound(buf.duplicate());
-
-        TankStartMovingMessage msg = (TankStartMovingMessage) ch.readInbound();
-
-        assertEquals(5, msg.getX());
-        assertEquals(10, msg.getY());
-        assertEquals(Dir.LEFT, msg.getDir());
-        assertEquals(id, msg.getId());
-    }
-}

src/test/java/com/example/tankbattle/net/TankJoinMessageCoderTest.java

@@ -1,83 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Dir;
-import com.example.tankbattle.Group;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.junit.jupiter.api.Test;
-
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class TankJoinMessageCoderTest {
-
-    @Test
-    void testEncoder() {
-        EmbeddedChannel ch = new EmbeddedChannel();
-
-
-        UUID id = UUID.randomUUID();
-        TankJoinMessage msg = new TankJoinMessage(5, 10, Dir.DOWN, true, Group.BAD, id);
-        ch.pipeline()
-                .addLast(new MessageEncoder());
-
-        ch.writeOutbound(msg);
-
-        ByteBuf buf = (ByteBuf)ch.readOutbound();
-        MessageType messageType = MessageType.values()[buf.readInt()];
-        assertEquals(MessageType.TankJoin, messageType);
-
-        int length = buf.readInt();
-        assertEquals(33, length);
-
-        int x = buf.readInt();
-        int y = buf.readInt();
-        int dirOrdinal = buf.readInt();
-        Dir dir = Dir.values()[dirOrdinal];
-        boolean moving = buf.readBoolean();
-        int groupOrdinal = buf.readInt();
-        Group g = Group.values()[groupOrdinal];
-        UUID uuid = new UUID(buf.readLong(), buf.readLong());
-
-        assertEquals(5, x);
-        assertEquals(10, y);
-        assertEquals(Dir.DOWN, dir);
-        assertEquals(true, moving);
-        assertEquals(Group.BAD, g);
-        assertEquals(id, uuid);
-    }
-
-    @Test
-    void testDecoder() {
-        EmbeddedChannel ch = new EmbeddedChannel();
-
-
-        UUID id = UUID.randomUUID();
-        TankJoinMessage message = new TankJoinMessage(5, 10, Dir.DOWN, true, Group.BAD, id);
-        ch.pipeline()
-                .addLast(new MessageDecoder());
-
-        ByteBuf buf = Unpooled.buffer();
-        buf.writeInt(MessageType.TankJoin.ordinal());
-        byte[] bytes = message.toBytes();
-        buf.writeInt(bytes.length);
-        buf.writeBytes(bytes);
-
-        ch.writeInbound(buf.duplicate());
-
-        TankJoinMessage msg = (TankJoinMessage) ch.readInbound();
-
-
-
-        assertEquals(5, msg.x);
-        assertEquals(10, msg.y);
-        assertEquals(Dir.DOWN, msg.dir);
-        assertEquals(true, msg.moving);
-        assertEquals(Group.BAD, msg.group);
-        assertEquals(id, msg.id);
-    }
-
-
-}

src/test/java/com/example/tankbattle/net/TankStartMovingMessageTest.java

@@ -1,71 +0,0 @@
-package com.example.tankbattle.net;
-
-import com.example.tankbattle.Dir;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.embedded.EmbeddedChannel;
-import org.junit.jupiter.api.Test;
-
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class TankStartMovingMessageTest {
-
-    @Test
-    void testEncoder() {
-        EmbeddedChannel ch = new EmbeddedChannel();
-
-
-        UUID id = UUID.randomUUID();
-        Message message = new TankDirChangedMessage(id, 5, 10, Dir.LEFT);
-        ch.pipeline()
-                .addLast(new MessageEncoder());
-
-        ch.writeOutbound(message);
-
-        ByteBuf buf = (ByteBuf)ch.readOutbound();
-        MessageType messageType = MessageType.values()[buf.readInt()];
-        assertEquals(MessageType.TankDirChanged, messageType);
-
-        int length = buf.readInt();
-        assertEquals(28, length);
-
-        UUID uuid = new UUID(buf.readLong(), buf.readLong());
-        int x = buf.readInt();
-        int y = buf.readInt();
-        int dirOrdinal = buf.readInt();
-        Dir dir = Dir.values()[dirOrdinal];
-
-        assertEquals(5, x);
-        assertEquals(10, y);
-        assertEquals(Dir.LEFT, dir);
-        assertEquals(id, uuid);
-    }
-
-    @Test
-    void testDecoder() {
-        EmbeddedChannel ch = new EmbeddedChannel();
-
-
-        UUID id = UUID.randomUUID();
-        TankDirChangedMessage message = new TankDirChangedMessage(id, 5, 10, Dir.LEFT);
-        ch.pipeline()
-                .addLast(new MessageDecoder());
-
-        ByteBuf buf = Unpooled.buffer();
-        buf.writeInt(MessageType.TankDirChanged.ordinal());
-        byte[] bytes = message.toBytes();
-        buf.writeInt(bytes.length);
-        buf.writeBytes(bytes);
-
-        ch.writeInbound(buf.duplicate());
-
-        TankDirChangedMessage msgR = (TankDirChangedMessage)ch.readInbound();
-
-        assertEquals(5, msgR.getX());
-        assertEquals(10, msgR.getY());
-        assertEquals(Dir.LEFT, msgR.getDir());
-        assertEquals(id, msgR.getId());
-    }
-}