From aedef00cb10d39d44ce9488801d3fa9fa896d948 Mon Sep 17 00:00:00 2001
From: bingor_yhj <bingor19890207@163.com>
Date: Mon, 3 Apr 2023 20:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9D=A6=E5=85=8B=E5=A4=A7=E6=88=98(=E4=B8=80?=
 =?UTF-8?q?=E6=9C=9F)-master=E5=88=86=E6=94=AF=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4=EF=BC=88=E5=9B=A0=E4=B8=BA=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1src=E8=B7=AF=E5=BE=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/{ => main/java}/com/msb/Bullet.java             |   0
 src/{ => main/java}/com/msb/DirEnum.java            |   0
 src/{ => main/java}/com/msb/Explode.java            |   0
 src/{ => main/java}/com/msb/GroupEnum.java          |   0
 src/{ => main/java}/com/msb/PropertyMgr.java        |   0
 src/{ => main/java}/com/msb/ResourcesMgr.java       |   0
 src/{ => main/java}/com/msb/Tank.java               |   0
 src/{ => main/java}/com/msb/TankDemo.java           |   6 +++---
 src/{ => main/java}/com/msb/TankFrame.java          |   0
 src/{ => main/java}/com/msb/util/ImageUtil.java     |   0
 {resources => src/main/resources}/config.properties |   0
 {resources => src/main/resources}/images/0.gif      | Bin
 {resources => src/main/resources}/images/1.gif      | Bin
 {resources => src/main/resources}/images/10.gif     | Bin
 {resources => src/main/resources}/images/2.gif      | Bin
 {resources => src/main/resources}/images/3.gif      | Bin
 {resources => src/main/resources}/images/4.gif      | Bin
 {resources => src/main/resources}/images/5.gif      | Bin
 {resources => src/main/resources}/images/6.gif      | Bin
 {resources => src/main/resources}/images/7.gif      | Bin
 {resources => src/main/resources}/images/8.gif      | Bin
 {resources => src/main/resources}/images/9.gif      | Bin
 .../main/resources}/images/BadTank1.png             | Bin
 .../main/resources}/images/BadTank2.png             | Bin
 .../main/resources}/images/GoodTank1.png            | Bin
 .../main/resources}/images/GoodTank2.png            | Bin
 .../main/resources}/images/bulletD.gif              | Bin
 .../main/resources}/images/bulletL.gif              | Bin
 .../main/resources}/images/bulletR.gif              | Bin
 .../main/resources}/images/bulletU.gif              | Bin
 .../main/resources}/images/bulletU.png              | Bin
 {resources => src/main/resources}/images/e1.gif     | Bin
 {resources => src/main/resources}/images/e10.gif    | Bin
 {resources => src/main/resources}/images/e11.gif    | Bin
 {resources => src/main/resources}/images/e12.gif    | Bin
 {resources => src/main/resources}/images/e13.gif    | Bin
 {resources => src/main/resources}/images/e14.gif    | Bin
 {resources => src/main/resources}/images/e15.gif    | Bin
 {resources => src/main/resources}/images/e16.gif    | Bin
 {resources => src/main/resources}/images/e2.gif     | Bin
 {resources => src/main/resources}/images/e3.gif     | Bin
 {resources => src/main/resources}/images/e4.gif     | Bin
 {resources => src/main/resources}/images/e5.gif     | Bin
 {resources => src/main/resources}/images/e6.gif     | Bin
 {resources => src/main/resources}/images/e7.gif     | Bin
 {resources => src/main/resources}/images/e8.gif     | Bin
 {resources => src/main/resources}/images/e9.gif     | Bin
 .../main/resources}/images/missileLD.gif            | Bin
 .../main/resources}/images/missileLU.gif            | Bin
 .../main/resources}/images/missileRD.gif            | Bin
 .../main/resources}/images/missileRU.gif            | Bin
 .../main/resources}/images/square0.jpg              | Bin
 .../main/resources}/images/square1.jpg              | Bin
 .../main/resources}/images/square2.jpg              | Bin
 .../main/resources}/images/square3.jpg              | Bin
 .../main/resources}/images/square4.jpg              | Bin
 .../main/resources}/images/square5.jpg              | Bin
 .../main/resources}/images/square6.jpg              | Bin
 {resources => src/main/resources}/images/tank.png   | Bin
 {resources => src/main/resources}/images/tankD.gif  | Bin
 {resources => src/main/resources}/images/tankL.gif  | Bin
 {resources => src/main/resources}/images/tankLD.gif | Bin
 {resources => src/main/resources}/images/tankLU.gif | Bin
 {resources => src/main/resources}/images/tankR.gif  | Bin
 {resources => src/main/resources}/images/tankRD.gif | Bin
 {resources => src/main/resources}/images/tankRU.gif | Bin
 {resources => src/main/resources}/images/tankU.gif  | Bin
 .../msb/test => test/java/com/msb}/CommonTest.java  |   3 +--
 68 files changed, 4 insertions(+), 5 deletions(-)
 rename src/{ => main/java}/com/msb/Bullet.java (100%)
 rename src/{ => main/java}/com/msb/DirEnum.java (100%)
 rename src/{ => main/java}/com/msb/Explode.java (100%)
 rename src/{ => main/java}/com/msb/GroupEnum.java (100%)
 rename src/{ => main/java}/com/msb/PropertyMgr.java (100%)
 rename src/{ => main/java}/com/msb/ResourcesMgr.java (100%)
 rename src/{ => main/java}/com/msb/Tank.java (100%)
 rename src/{ => main/java}/com/msb/TankDemo.java (72%)
 rename src/{ => main/java}/com/msb/TankFrame.java (100%)
 rename src/{ => main/java}/com/msb/util/ImageUtil.java (100%)
 rename {resources => src/main/resources}/config.properties (100%)
 rename {resources => src/main/resources}/images/0.gif (100%)
 rename {resources => src/main/resources}/images/1.gif (100%)
 rename {resources => src/main/resources}/images/10.gif (100%)
 rename {resources => src/main/resources}/images/2.gif (100%)
 rename {resources => src/main/resources}/images/3.gif (100%)
 rename {resources => src/main/resources}/images/4.gif (100%)
 rename {resources => src/main/resources}/images/5.gif (100%)
 rename {resources => src/main/resources}/images/6.gif (100%)
 rename {resources => src/main/resources}/images/7.gif (100%)
 rename {resources => src/main/resources}/images/8.gif (100%)
 rename {resources => src/main/resources}/images/9.gif (100%)
 rename {resources => src/main/resources}/images/BadTank1.png (100%)
 rename {resources => src/main/resources}/images/BadTank2.png (100%)
 rename {resources => src/main/resources}/images/GoodTank1.png (100%)
 rename {resources => src/main/resources}/images/GoodTank2.png (100%)
 rename {resources => src/main/resources}/images/bulletD.gif (100%)
 rename {resources => src/main/resources}/images/bulletL.gif (100%)
 rename {resources => src/main/resources}/images/bulletR.gif (100%)
 rename {resources => src/main/resources}/images/bulletU.gif (100%)
 rename {resources => src/main/resources}/images/bulletU.png (100%)
 rename {resources => src/main/resources}/images/e1.gif (100%)
 rename {resources => src/main/resources}/images/e10.gif (100%)
 rename {resources => src/main/resources}/images/e11.gif (100%)
 rename {resources => src/main/resources}/images/e12.gif (100%)
 rename {resources => src/main/resources}/images/e13.gif (100%)
 rename {resources => src/main/resources}/images/e14.gif (100%)
 rename {resources => src/main/resources}/images/e15.gif (100%)
 rename {resources => src/main/resources}/images/e16.gif (100%)
 rename {resources => src/main/resources}/images/e2.gif (100%)
 rename {resources => src/main/resources}/images/e3.gif (100%)
 rename {resources => src/main/resources}/images/e4.gif (100%)
 rename {resources => src/main/resources}/images/e5.gif (100%)
 rename {resources => src/main/resources}/images/e6.gif (100%)
 rename {resources => src/main/resources}/images/e7.gif (100%)
 rename {resources => src/main/resources}/images/e8.gif (100%)
 rename {resources => src/main/resources}/images/e9.gif (100%)
 rename {resources => src/main/resources}/images/missileLD.gif (100%)
 rename {resources => src/main/resources}/images/missileLU.gif (100%)
 rename {resources => src/main/resources}/images/missileRD.gif (100%)
 rename {resources => src/main/resources}/images/missileRU.gif (100%)
 rename {resources => src/main/resources}/images/square0.jpg (100%)
 rename {resources => src/main/resources}/images/square1.jpg (100%)
 rename {resources => src/main/resources}/images/square2.jpg (100%)
 rename {resources => src/main/resources}/images/square3.jpg (100%)
 rename {resources => src/main/resources}/images/square4.jpg (100%)
 rename {resources => src/main/resources}/images/square5.jpg (100%)
 rename {resources => src/main/resources}/images/square6.jpg (100%)
 rename {resources => src/main/resources}/images/tank.png (100%)
 rename {resources => src/main/resources}/images/tankD.gif (100%)
 rename {resources => src/main/resources}/images/tankL.gif (100%)
 rename {resources => src/main/resources}/images/tankLD.gif (100%)
 rename {resources => src/main/resources}/images/tankLU.gif (100%)
 rename {resources => src/main/resources}/images/tankR.gif (100%)
 rename {resources => src/main/resources}/images/tankRD.gif (100%)
 rename {resources => src/main/resources}/images/tankRU.gif (100%)
 rename {resources => src/main/resources}/images/tankU.gif (100%)
 rename src/{com/msb/test => test/java/com/msb}/CommonTest.java (96%)

diff --git a/src/com/msb/Bullet.java b/src/main/java/com/msb/Bullet.java
similarity index 100%
rename from src/com/msb/Bullet.java
rename to src/main/java/com/msb/Bullet.java
diff --git a/src/com/msb/DirEnum.java b/src/main/java/com/msb/DirEnum.java
similarity index 100%
rename from src/com/msb/DirEnum.java
rename to src/main/java/com/msb/DirEnum.java
diff --git a/src/com/msb/Explode.java b/src/main/java/com/msb/Explode.java
similarity index 100%
rename from src/com/msb/Explode.java
rename to src/main/java/com/msb/Explode.java
diff --git a/src/com/msb/GroupEnum.java b/src/main/java/com/msb/GroupEnum.java
similarity index 100%
rename from src/com/msb/GroupEnum.java
rename to src/main/java/com/msb/GroupEnum.java
diff --git a/src/com/msb/PropertyMgr.java b/src/main/java/com/msb/PropertyMgr.java
similarity index 100%
rename from src/com/msb/PropertyMgr.java
rename to src/main/java/com/msb/PropertyMgr.java
diff --git a/src/com/msb/ResourcesMgr.java b/src/main/java/com/msb/ResourcesMgr.java
similarity index 100%
rename from src/com/msb/ResourcesMgr.java
rename to src/main/java/com/msb/ResourcesMgr.java
diff --git a/src/com/msb/Tank.java b/src/main/java/com/msb/Tank.java
similarity index 100%
rename from src/com/msb/Tank.java
rename to src/main/java/com/msb/Tank.java
diff --git a/src/com/msb/TankDemo.java b/src/main/java/com/msb/TankDemo.java
similarity index 72%
rename from src/com/msb/TankDemo.java
rename to src/main/java/com/msb/TankDemo.java
index b9e0274..2f5edd7 100644
--- a/src/com/msb/TankDemo.java
+++ b/src/main/java/com/msb/TankDemo.java
@@ -11,15 +11,15 @@ import java.util.Random;
 public class TankDemo {
 
     public static void main(String[] args) throws InterruptedException {
-         TankFrame tankFrame = new TankFrame();
+         com.msb.TankFrame tankFrame = new com.msb.TankFrame();
         Random random = new Random();
 
-        int initTankCount = Integer.parseInt(PropertyMgr.getString("initTankCount"));
+        int initTankCount = Integer.parseInt(com.msb.PropertyMgr.getString("initTankCount"));
 
          //创建5个敌方坦克
         for (int i=0; i<initTankCount; i++) {
 //            tankFrame.tanks.add(new Tank(100 + i*80, 100, DirEnum.valueOf(random.nextInt(30)%4), GroupEnum.BAD, tankFrame));
-            tankFrame.tanks.add(new Tank(100 + i*80, 100, DirEnum.DOWN, GroupEnum.BAD, tankFrame));
+            tankFrame.tanks.add(new com.msb.Tank(100 + i*80, 100, com.msb.DirEnum.DOWN, com.msb.GroupEnum.BAD, tankFrame));
         }
 
          //现实当中，虽然可以过按键来改变方块的坐标并且重新刷新画板来实现移动，但是敌方的坦克应该是自动在跑
diff --git a/src/com/msb/TankFrame.java b/src/main/java/com/msb/TankFrame.java
similarity index 100%
rename from src/com/msb/TankFrame.java
rename to src/main/java/com/msb/TankFrame.java
diff --git a/src/com/msb/util/ImageUtil.java b/src/main/java/com/msb/util/ImageUtil.java
similarity index 100%
rename from src/com/msb/util/ImageUtil.java
rename to src/main/java/com/msb/util/ImageUtil.java
diff --git a/resources/config.properties b/src/main/resources/config.properties
similarity index 100%
rename from resources/config.properties
rename to src/main/resources/config.properties
diff --git a/resources/images/0.gif b/src/main/resources/images/0.gif
similarity index 100%
rename from resources/images/0.gif
rename to src/main/resources/images/0.gif
diff --git a/resources/images/1.gif b/src/main/resources/images/1.gif
similarity index 100%
rename from resources/images/1.gif
rename to src/main/resources/images/1.gif
diff --git a/resources/images/10.gif b/src/main/resources/images/10.gif
similarity index 100%
rename from resources/images/10.gif
rename to src/main/resources/images/10.gif
diff --git a/resources/images/2.gif b/src/main/resources/images/2.gif
similarity index 100%
rename from resources/images/2.gif
rename to src/main/resources/images/2.gif
diff --git a/resources/images/3.gif b/src/main/resources/images/3.gif
similarity index 100%
rename from resources/images/3.gif
rename to src/main/resources/images/3.gif
diff --git a/resources/images/4.gif b/src/main/resources/images/4.gif
similarity index 100%
rename from resources/images/4.gif
rename to src/main/resources/images/4.gif
diff --git a/resources/images/5.gif b/src/main/resources/images/5.gif
similarity index 100%
rename from resources/images/5.gif
rename to src/main/resources/images/5.gif
diff --git a/resources/images/6.gif b/src/main/resources/images/6.gif
similarity index 100%
rename from resources/images/6.gif
rename to src/main/resources/images/6.gif
diff --git a/resources/images/7.gif b/src/main/resources/images/7.gif
similarity index 100%
rename from resources/images/7.gif
rename to src/main/resources/images/7.gif
diff --git a/resources/images/8.gif b/src/main/resources/images/8.gif
similarity index 100%
rename from resources/images/8.gif
rename to src/main/resources/images/8.gif
diff --git a/resources/images/9.gif b/src/main/resources/images/9.gif
similarity index 100%
rename from resources/images/9.gif
rename to src/main/resources/images/9.gif
diff --git a/resources/images/BadTank1.png b/src/main/resources/images/BadTank1.png
similarity index 100%
rename from resources/images/BadTank1.png
rename to src/main/resources/images/BadTank1.png
diff --git a/resources/images/BadTank2.png b/src/main/resources/images/BadTank2.png
similarity index 100%
rename from resources/images/BadTank2.png
rename to src/main/resources/images/BadTank2.png
diff --git a/resources/images/GoodTank1.png b/src/main/resources/images/GoodTank1.png
similarity index 100%
rename from resources/images/GoodTank1.png
rename to src/main/resources/images/GoodTank1.png
diff --git a/resources/images/GoodTank2.png b/src/main/resources/images/GoodTank2.png
similarity index 100%
rename from resources/images/GoodTank2.png
rename to src/main/resources/images/GoodTank2.png
diff --git a/resources/images/bulletD.gif b/src/main/resources/images/bulletD.gif
similarity index 100%
rename from resources/images/bulletD.gif
rename to src/main/resources/images/bulletD.gif
diff --git a/resources/images/bulletL.gif b/src/main/resources/images/bulletL.gif
similarity index 100%
rename from resources/images/bulletL.gif
rename to src/main/resources/images/bulletL.gif
diff --git a/resources/images/bulletR.gif b/src/main/resources/images/bulletR.gif
similarity index 100%
rename from resources/images/bulletR.gif
rename to src/main/resources/images/bulletR.gif
diff --git a/resources/images/bulletU.gif b/src/main/resources/images/bulletU.gif
similarity index 100%
rename from resources/images/bulletU.gif
rename to src/main/resources/images/bulletU.gif
diff --git a/resources/images/bulletU.png b/src/main/resources/images/bulletU.png
similarity index 100%
rename from resources/images/bulletU.png
rename to src/main/resources/images/bulletU.png
diff --git a/resources/images/e1.gif b/src/main/resources/images/e1.gif
similarity index 100%
rename from resources/images/e1.gif
rename to src/main/resources/images/e1.gif
diff --git a/resources/images/e10.gif b/src/main/resources/images/e10.gif
similarity index 100%
rename from resources/images/e10.gif
rename to src/main/resources/images/e10.gif
diff --git a/resources/images/e11.gif b/src/main/resources/images/e11.gif
similarity index 100%
rename from resources/images/e11.gif
rename to src/main/resources/images/e11.gif
diff --git a/resources/images/e12.gif b/src/main/resources/images/e12.gif
similarity index 100%
rename from resources/images/e12.gif
rename to src/main/resources/images/e12.gif
diff --git a/resources/images/e13.gif b/src/main/resources/images/e13.gif
similarity index 100%
rename from resources/images/e13.gif
rename to src/main/resources/images/e13.gif
diff --git a/resources/images/e14.gif b/src/main/resources/images/e14.gif
similarity index 100%
rename from resources/images/e14.gif
rename to src/main/resources/images/e14.gif
diff --git a/resources/images/e15.gif b/src/main/resources/images/e15.gif
similarity index 100%
rename from resources/images/e15.gif
rename to src/main/resources/images/e15.gif
diff --git a/resources/images/e16.gif b/src/main/resources/images/e16.gif
similarity index 100%
rename from resources/images/e16.gif
rename to src/main/resources/images/e16.gif
diff --git a/resources/images/e2.gif b/src/main/resources/images/e2.gif
similarity index 100%
rename from resources/images/e2.gif
rename to src/main/resources/images/e2.gif
diff --git a/resources/images/e3.gif b/src/main/resources/images/e3.gif
similarity index 100%
rename from resources/images/e3.gif
rename to src/main/resources/images/e3.gif
diff --git a/resources/images/e4.gif b/src/main/resources/images/e4.gif
similarity index 100%
rename from resources/images/e4.gif
rename to src/main/resources/images/e4.gif
diff --git a/resources/images/e5.gif b/src/main/resources/images/e5.gif
similarity index 100%
rename from resources/images/e5.gif
rename to src/main/resources/images/e5.gif
diff --git a/resources/images/e6.gif b/src/main/resources/images/e6.gif
similarity index 100%
rename from resources/images/e6.gif
rename to src/main/resources/images/e6.gif
diff --git a/resources/images/e7.gif b/src/main/resources/images/e7.gif
similarity index 100%
rename from resources/images/e7.gif
rename to src/main/resources/images/e7.gif
diff --git a/resources/images/e8.gif b/src/main/resources/images/e8.gif
similarity index 100%
rename from resources/images/e8.gif
rename to src/main/resources/images/e8.gif
diff --git a/resources/images/e9.gif b/src/main/resources/images/e9.gif
similarity index 100%
rename from resources/images/e9.gif
rename to src/main/resources/images/e9.gif
diff --git a/resources/images/missileLD.gif b/src/main/resources/images/missileLD.gif
similarity index 100%
rename from resources/images/missileLD.gif
rename to src/main/resources/images/missileLD.gif
diff --git a/resources/images/missileLU.gif b/src/main/resources/images/missileLU.gif
similarity index 100%
rename from resources/images/missileLU.gif
rename to src/main/resources/images/missileLU.gif
diff --git a/resources/images/missileRD.gif b/src/main/resources/images/missileRD.gif
similarity index 100%
rename from resources/images/missileRD.gif
rename to src/main/resources/images/missileRD.gif
diff --git a/resources/images/missileRU.gif b/src/main/resources/images/missileRU.gif
similarity index 100%
rename from resources/images/missileRU.gif
rename to src/main/resources/images/missileRU.gif
diff --git a/resources/images/square0.jpg b/src/main/resources/images/square0.jpg
similarity index 100%
rename from resources/images/square0.jpg
rename to src/main/resources/images/square0.jpg
diff --git a/resources/images/square1.jpg b/src/main/resources/images/square1.jpg
similarity index 100%
rename from resources/images/square1.jpg
rename to src/main/resources/images/square1.jpg
diff --git a/resources/images/square2.jpg b/src/main/resources/images/square2.jpg
similarity index 100%
rename from resources/images/square2.jpg
rename to src/main/resources/images/square2.jpg
diff --git a/resources/images/square3.jpg b/src/main/resources/images/square3.jpg
similarity index 100%
rename from resources/images/square3.jpg
rename to src/main/resources/images/square3.jpg
diff --git a/resources/images/square4.jpg b/src/main/resources/images/square4.jpg
similarity index 100%
rename from resources/images/square4.jpg
rename to src/main/resources/images/square4.jpg
diff --git a/resources/images/square5.jpg b/src/main/resources/images/square5.jpg
similarity index 100%
rename from resources/images/square5.jpg
rename to src/main/resources/images/square5.jpg
diff --git a/resources/images/square6.jpg b/src/main/resources/images/square6.jpg
similarity index 100%
rename from resources/images/square6.jpg
rename to src/main/resources/images/square6.jpg
diff --git a/resources/images/tank.png b/src/main/resources/images/tank.png
similarity index 100%
rename from resources/images/tank.png
rename to src/main/resources/images/tank.png
diff --git a/resources/images/tankD.gif b/src/main/resources/images/tankD.gif
similarity index 100%
rename from resources/images/tankD.gif
rename to src/main/resources/images/tankD.gif
diff --git a/resources/images/tankL.gif b/src/main/resources/images/tankL.gif
similarity index 100%
rename from resources/images/tankL.gif
rename to src/main/resources/images/tankL.gif
diff --git a/resources/images/tankLD.gif b/src/main/resources/images/tankLD.gif
similarity index 100%
rename from resources/images/tankLD.gif
rename to src/main/resources/images/tankLD.gif
diff --git a/resources/images/tankLU.gif b/src/main/resources/images/tankLU.gif
similarity index 100%
rename from resources/images/tankLU.gif
rename to src/main/resources/images/tankLU.gif
diff --git a/resources/images/tankR.gif b/src/main/resources/images/tankR.gif
similarity index 100%
rename from resources/images/tankR.gif
rename to src/main/resources/images/tankR.gif
diff --git a/resources/images/tankRD.gif b/src/main/resources/images/tankRD.gif
similarity index 100%
rename from resources/images/tankRD.gif
rename to src/main/resources/images/tankRD.gif
diff --git a/resources/images/tankRU.gif b/src/main/resources/images/tankRU.gif
similarity index 100%
rename from resources/images/tankRU.gif
rename to src/main/resources/images/tankRU.gif
diff --git a/resources/images/tankU.gif b/src/main/resources/images/tankU.gif
similarity index 100%
rename from resources/images/tankU.gif
rename to src/main/resources/images/tankU.gif
diff --git a/src/com/msb/test/CommonTest.java b/src/test/java/com/msb/CommonTest.java
similarity index 96%
rename from src/com/msb/test/CommonTest.java
rename to src/test/java/com/msb/CommonTest.java
index 8906c23..490f653 100644
--- a/src/com/msb/test/CommonTest.java
+++ b/src/test/java/com/msb/CommonTest.java
@@ -1,6 +1,5 @@
-package com.msb.test;
+package com.msb;
 
-import com.msb.DirEnum;
 import org.junit.Assert;
 import org.junit.Test;