diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5853470..3051dcb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,28 +4,25 @@
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -250,7 +247,15 @@
1737361026740
-
+
+
+ 1737604510164
+
+
+
+ 1737604510164
+
+
@@ -309,6 +314,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/java/org/start/command/command.java b/src/main/java/org/start/command/command.java
index 24d376f..7c3e980 100644
--- a/src/main/java/org/start/command/command.java
+++ b/src/main/java/org/start/command/command.java
@@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
import org.start.data.TeamManager;
import org.start.player.cuan_song.chuan_song;
-import org.start.player.pCase.run_;
+import org.start.player.pCase.pCase_run_;
import org.start.print;
import org.start.player.bossbar.boss_bar_runs;
@@ -57,7 +57,7 @@ public class command implements CommandExecutor {
boss_bar_runs.onPlayerJoinTeam(player,"red"); //为玩家添加进度条
print.player_p(player,"你已加入进攻方");
print.boardChat("玩家"+ player.getName()+"加入进攻方");
- run_.joinRed(player);
+ pCase_run_.joinRed(player);
return true;
}
}
@@ -71,7 +71,7 @@ public class command implements CommandExecutor {
boss_bar_runs.onPlayerJoinTeam(player,"blue");
print.player_p(player,"你已加入防守方");
print.boardChat("玩家"+ player.getName()+"加入进攻方");
- run_.joinBlue(player);
+ pCase_run_.joinBlue(player);
return true;
}
@@ -88,7 +88,7 @@ public class command implements CommandExecutor {
boss_bar_runs.onPlayerLeaveTeam(player); //移除玩家的进度条
print.boardChat("玩家"+ player.getName()+"离开守塔模式");
TeamManager.removePlayer(player.getName()); //将玩家移出存储类
- run_.stop(player);
+ pCase_run_.stop(player);
return true;
}
diff --git a/src/main/java/org/start/data/TeamManager.java b/src/main/java/org/start/data/TeamManager.java
index 838797b..37fc24b 100644
--- a/src/main/java/org/start/data/TeamManager.java
+++ b/src/main/java/org/start/data/TeamManager.java
@@ -18,7 +18,6 @@ public class TeamManager {
*/
public static void setPlayer(String playerName, String teamType) {
playerTeamMap.put(playerName, teamType);
- print.command_p("i", "玩家"+ playerName + "加入" + teamType);
}
/**
@@ -49,7 +48,6 @@ public class TeamManager {
public static boolean removePlayer(String playerName) {
if (playerTeamMap.containsKey(playerName)) {
playerTeamMap.remove(playerName);
- print.command_p("i" ,"玩家 " + playerName + " 已退出队伍");
return true;
} else {
return false;
diff --git a/src/main/java/org/start/data/worldSpawnItem.java b/src/main/java/org/start/data/worldSpawnItem.java
index 406b279..29cf388 100644
--- a/src/main/java/org/start/data/worldSpawnItem.java
+++ b/src/main/java/org/start/data/worldSpawnItem.java
@@ -38,10 +38,10 @@ public class worldSpawnItem {
world = plugin.getServer().getWorld(world_);
if (world == null){
- print.command_p("e", "未找到可用的世界名，已设为默认（world）");
+ print.command_p(print.PrintEnum.E, "未找到可用的世界名，已设为默认（world）");
world = plugin.getServer().getWorld("world");
}else {
- print.command_p("i","加载世界名：" + world.getName());
+ print.command_p(print.PrintEnum.I,"加载世界名：" + world.getName());
}
//获取各队伍位置
@@ -49,25 +49,25 @@ public class worldSpawnItem {
redPath_x = plugin.getConfig().getDouble("red_path.x");
redPath_y = plugin.getConfig().getDouble("red_path.y");
redPath_z = plugin.getConfig().getDouble("red_path.z");
- print.command_p("i", "获取到的进攻方的数据为 "+redPath_x + " " +redPath_y+ " " +redPath_z);
+ print.command_p(print.PrintEnum.I, "获取到的进攻方的数据为 "+redPath_x + " " +redPath_y+ " " +redPath_z);
}catch (Exception e){
- print.command_p("e", "无法获取进攻方队伍数据，请检查配置文件 ( " + e + " ) ");
+ print.command_p(print.PrintEnum.I, "无法获取进攻方队伍数据，请检查配置文件 ( " + e + " ) ");
}
try {
bluePath_x = plugin.getConfig().getDouble("blue_path.x");
bluePath_y = plugin.getConfig().getDouble("blue_path.y");
bluePath_z = plugin.getConfig().getDouble("blue_path.z");
- print.command_p("i", "获取到的防守方数据为 "+ bluePath_x +" " + bluePath_y + " " + bluePath_z);
+ print.command_p(print.PrintEnum.I, "获取到的防守方数据为 "+ bluePath_x +" " + bluePath_y + " " + bluePath_z);
}catch (Exception e){
- print.command_p("e", "无法获取防守方队伍数据，请检查配置文件 ( " + e + " ) ");
+ print.command_p(print.PrintEnum.E, "无法获取防守方队伍数据，请检查配置文件 ( " + e + " ) ");
}
try {
stopPath_x = plugin.getConfig().getDouble("stop_path.x");
stopPath_y = plugin.getConfig().getDouble("stop_path.y");
stopPath_z = plugin.getConfig().getDouble("stop_path.z");
- print.command_p("i", "获取到的停止队列的数据为 " + stopPath_x + " " + stopPath_y + " " + stopPath_z);
+ print.command_p(print.PrintEnum.I, "获取到的停止队列的数据为 " + stopPath_x + " " + stopPath_y + " " + stopPath_z);
}catch (Exception e){
- print.command_p("e", "无法获取停止队伍数据，请检查配置文件 ( " + e + " )");
+ print.command_p(print.PrintEnum.E, "无法获取停止队伍数据，请检查配置文件 ( " + e + " )");
}
}
diff --git a/src/main/java/org/start/getConfig.java b/src/main/java/org/start/getConfig.java
deleted file mode 100644
index 100bd7c..0000000
--- a/src/main/java/org/start/getConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.start;
-
-import org.bukkit.ChatColor;
-import org.bukkit.plugin.java.JavaPlugin;
-
-
-public class getConfig {
- private static JavaPlugin plugin;
- public getConfig(JavaPlugin plugin){getConfig.plugin = plugin;plugin.getLogger().info("getConfig 类初始化操作已完成");}
-
- public static double getDouble(String path, double def){
-
- // 传 0.0 等于sb 或者本身需求就是 0.0，所以直接返回 0.0
- if (def == 0.0){
- print.command_p(print.PrintEnum.E, "The target path " + ChatColor.YELLOW + path + " is empty or 0.0, and the default value is 0.0. In general, this is not a normal result");
- return def;
- }
-
- double d = plugin.getConfig().getDouble(path);
- if (d == 0.0){d = def;}
-
- return d;
- }
-
- public static String getString(String path, String def) throws Exception {
-
- String s = plugin.getConfig().getString(path);
-
- if (s == null & def == null){
- print.command_p(print.PrintEnum.E, "The target path " + ChatColor.YELLOW + path + " is empty, and the default value is empty. In general, this is not a normal result");
- return null;
- }
-
- if (s == null){
- return def;
- }
-
- return s;
- }
-}
diff --git a/src/main/java/org/start/player/main/run_.java b/src/main/java/org/start/player/main/model_run_.java
similarity index 95%
rename from src/main/java/org/start/player/main/run_.java
rename to src/main/java/org/start/player/main/model_run_.java
index 65c4b3a..893c78b 100644
--- a/src/main/java/org/start/player/main/run_.java
+++ b/src/main/java/org/start/player/main/model_run_.java
@@ -14,14 +14,14 @@ import org.start.player.main.model.shi_fo_at;
import org.start.print;
-public class run_{
+public class model_run_ {
private JavaPlugin plugin; // 插件实例，用于访问服务器的API
private double redTeamProgress = 0; // 红队的进攻进度（0-100），初始为0
private boolean gameEnded = false; // 游戏是否已经结束的标志
private static boolean b; //用于判断是否有玩家在目标位置
- public run_(JavaPlugin plugin) {
+ public model_run_(JavaPlugin plugin) {
this.plugin = plugin;
plugin.getLogger().info("run_ 类初始化已完成");
_start(); // 启动任务
@@ -29,7 +29,7 @@ public class run_{
// 开始定时检查红队进攻进度的任务
public void _start() {
- print.command_p( "i","计时任务正在运行");
+ print.command_p( print.PrintEnum.I,"计时任务正在运行");
new shi_fo_at(); // 初始化判断类
new redAtEvent().first(); //初始化，防止出错
diff --git a/src/main/java/org/start/player/pCase/run_.java b/src/main/java/org/start/player/pCase/pCase_run_.java
similarity index 90%
rename from src/main/java/org/start/player/pCase/run_.java
rename to src/main/java/org/start/player/pCase/pCase_run_.java
index 1393a9c..5d1952d 100644
--- a/src/main/java/org/start/player/pCase/run_.java
+++ b/src/main/java/org/start/player/pCase/pCase_run_.java
@@ -7,10 +7,10 @@ import org.bukkit.entity.Player;
// 玩家抗性系统 -> no
// 玩家血量系统 -> no
// 玩家盔甲颜色系统 -> ok
-public class run_ {
+public class pCase_run_ {
- public static void init(){
- p_heath.init();
+ public static void _init(){
+ p_heath._init();
}
public static void joinRed(Player player){
diff --git a/src/main/java/org/start/player/pCase/p_IdName.java b/src/main/java/org/start/player/pCase/p_IdName.java
index ae5f16a..47fac6a 100644
--- a/src/main/java/org/start/player/pCase/p_IdName.java
+++ b/src/main/java/org/start/player/pCase/p_IdName.java
@@ -1,26 +1,27 @@
package org.start.player.pCase;
-import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
// 控制玩家头顶的名字状态
public class p_IdName {
+
public static void setRed(Player player){
- String red = ChatColor.RED+"[红队] " + player.getName();
- player.setCustomName(red);
- player.setCustomNameVisible(true);
+ String red = "[红队] " + player.getCustomName();
+ player.setPlayerListName(red);
}
public static void setBlue(Player player){
- String blue = ChatColor.BLUE + "[蓝队] " + player.getName();
- player.setCustomName(blue);
- player.setCustomNameVisible(true);
+ String newName = "demoBlue"+ player.getName();
+ player.setDisplayName(newName);
}
public static void setStop(Player player){
+
player.setCustomName(player.getName());
player.setCustomNameVisible(true);
- }
+ }
}
+
+
diff --git a/src/main/java/org/start/player/pCase/p_heath.java b/src/main/java/org/start/player/pCase/p_heath.java
index a445133..23c4282 100644
--- a/src/main/java/org/start/player/pCase/p_heath.java
+++ b/src/main/java/org/start/player/pCase/p_heath.java
@@ -1,15 +1,17 @@
package org.start.player.pCase;
import org.bukkit.entity.Player;
-import org.start.getConfig;
+import org.bukkit.plugin.java.JavaPlugin;
import org.start.print;
public class p_heath {
+ private static JavaPlugin plugin;
+ public static void _p_heath(JavaPlugin plugin){p_heath.plugin = plugin;plugin.getLogger().info("p_heath 类初始化操作已完成");}
private static double heath;
- public static void init(){
- heath = getConfig.getDouble("heath", 40);
+ public static void _init(){
+ heath = plugin.getConfig().getDouble("heath", 40);
}
public static void setHeath(Player player){
@@ -30,7 +32,7 @@ public class p_heath {
try {
player.setHealth(heath);
}catch (Exception e){
- print.command_p("e",""+e);
+ print.command_p(print.PrintEnum.E,""+e);
}
@@ -39,5 +41,6 @@ public class p_heath {
public static void stop(Player player){
double h = 20.0;
player.setHealth(h);
+ player.setMaxHealth(h);
}
}
diff --git a/src/main/java/org/start/player/pCase/p_kang_xing.java b/src/main/java/org/start/player/pCase/p_kang_xing.java
index e8a57d2..f15a983 100644
--- a/src/main/java/org/start/player/pCase/p_kang_xing.java
+++ b/src/main/java/org/start/player/pCase/p_kang_xing.java
@@ -1,23 +1,26 @@
package org.start.player.pCase;
import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
-import org.start.getConfig;
import org.start.print;
import org.start.print.PrintEnum;
public class p_kang_xing {
+ private static JavaPlugin plugin;
+ public static void _p_kang_xing(JavaPlugin plugin){p_kang_xing.plugin = plugin;plugin.getLogger().info("p_heath 类初始化操作已完成");}
+
private static int duration; // 设定持续时间
private static int amplifier; //设置效果等级
private static double heath = 60.0;
public static void init(){
- double amplifier_ = getConfig.getDouble("amplifier", 5);
+ double amplifier_ = plugin.getConfig().getDouble("amplifier", 5);
amplifier = (int) amplifier_;
- double duration_ = getConfig.getDouble("duration", 7200);
+ double duration_ = plugin.getConfig().getDouble("duration", 7200);
duration = (int) duration_;
if (duration == 5 & amplifier == 7200){
diff --git a/src/main/java/org/start/run.java b/src/main/java/org/start/run.java
index ed02ad0..2c76a4a 100644
--- a/src/main/java/org/start/run.java
+++ b/src/main/java/org/start/run.java
@@ -35,7 +35,9 @@ import org.start.player.cuan_song.chuan_song;
import org.start.data.worldSpawnItem;
import org.start.player.main.model.def_path;
import org.start.player.bossbar.boss_bar_runs;
-import org.start.player.main.run_;
+import org.start.player.main.model_run_;
+import org.start.player.pCase.pCase_run_;
+import org.start.player.pCase.p_heath;
public class run extends JavaPlugin implements Listener {
@@ -46,16 +48,30 @@ public class run extends JavaPlugin implements Listener {
// 截至目前，加入队伍后出现报错，可能是管理进度条的类出现问题。
- //开始初始化 这几句都是爷，必须最先初始化
- new print(this); // <------- 初始化信息输出类，位于当前文件
- new getConfig(this); // <------- 初始化配置获取类
+
+ getLogger().info(" ");
+ getLogger().info(" ");
+ getLogger().info(" ---------- >>> 守塔模式插件开始初始化 <<< ---------- ");
+ getLogger().info(" ");
+
+ // 开始初始化 这几句都是爷，必须最先初始化
+ // 初始化顺序千万别更改，往后我在优化
+ new print(this); // <------- 初始化信息输出类，位于当前文件
new worldSpawnItem(this); // <------- 初始化传送点获取类，位于data
def_path.def_path_(this); // <------- 初始化玩家占领点获取类，位于player -> main
new def_path().initPath(); // <------- 初始化占领点位置
+
new boss_bar_runs(this); // <------- 初始化进度条类，位于player -> main
boss_bar_runs.main_runs_(); // <------- 实例化进度条辅助类
- new run_(this); // <------- 初始化核心调度类
+ new model_run_(this); // <------- 初始化核心调度类
+
+ p_heath._p_heath(this); // <------- 初始化血量控制类，唯于 player -> pCase -> p_heath
+ pCase_run_._init(); // <------- 初始化玩家信息类，位于 player -> pCase -> pCase_run_
+
+ getLogger().info(" ");
+ getLogger().info(" ---------- >>> 守塔模式插件初始化已完成 <<< ---------- ");
+ getLogger().info(" ");
new chuan_song(this).initLocation(); //初始化玩家传送点 (这个this真的给我整红温了)
diff --git a/target/classes/config.yml b/target/classes/config.yml
index f439750..fee463a 100644
--- a/target/classes/config.yml
+++ b/target/classes/config.yml
@@ -40,5 +40,15 @@ capture_area:
z: 110
+# 指定玩家获得的抗性提升等级，时间
+amplifier: 7
+duration: 10000
+
+
+# 指定玩家进入该模式时，修改玩家血量为多少
+heath: 60
+
+
+
diff --git a/target/classes/org/start/command/command.class b/target/classes/org/start/command/command.class
index 91e6b00..0ec321a 100644
Binary files a/target/classes/org/start/command/command.class and b/target/classes/org/start/command/command.class differ
diff --git a/target/classes/org/start/data/TeamManager.class b/target/classes/org/start/data/TeamManager.class
index 6ae8b25..c41e094 100644
Binary files a/target/classes/org/start/data/TeamManager.class and b/target/classes/org/start/data/TeamManager.class differ
diff --git a/target/classes/org/start/data/worldSpawnItem.class b/target/classes/org/start/data/worldSpawnItem.class
index c23c11b..d70630f 100644
Binary files a/target/classes/org/start/data/worldSpawnItem.class and b/target/classes/org/start/data/worldSpawnItem.class differ
diff --git a/target/classes/org/start/player/main/run_$1.class b/target/classes/org/start/player/main/run_$1.class
deleted file mode 100644
index b6ba0a1..0000000
Binary files a/target/classes/org/start/player/main/run_$1.class and /dev/null differ
diff --git a/target/classes/org/start/player/main/run_.class b/target/classes/org/start/player/main/run_.class
deleted file mode 100644
index 183a8b2..0000000
Binary files a/target/classes/org/start/player/main/run_.class and /dev/null differ
diff --git a/target/classes/org/start/print.class b/target/classes/org/start/print.class
index 272fdc3..8ee8b42 100644
Binary files a/target/classes/org/start/print.class and b/target/classes/org/start/print.class differ
diff --git a/target/classes/org/start/run.class b/target/classes/org/start/run.class
index c5832e3..f4aed60 100644
Binary files a/target/classes/org/start/run.class and b/target/classes/org/start/run.class differ
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 10fe0d9..9d8ab7e 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,13 +1,15 @@
org\start\player\pCase\p_heath.class
org\start\player\bossbar\manger.class
+org\start\player\pCase\pCase_run_.class
org\start\run.class
org\start\player\main\model\shi_fo_at.class
org\start\player\bossbar\boss_bar_runs.class
+org\start\player\main\model_run_.class
org\start\player\main\model\redAtEvent.class
org\start\player\pCase\p_kui_jia.class
-org\start\player\main\run_.class
-org\start\player\pCase\run_.class
org\start\player\cuan_song\chuan_song.class
+org\start\player\main\model_run_$1.class
+org\start\print$PrintEnum.class
org\start\command\commandTab.class
org\start\player\pCase\p_kang_xing.class
org\start\print.class
@@ -15,5 +17,4 @@ org\start\player\pCase\p_IdName.class
org\start\player\bossbar\data.class
org\start\player\main\model\def_path.class
org\start\data\TeamManager.class
-org\start\player\main\run_$1.class
org\start\command\command.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 40b0b7f..68dc6b9 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,6 +1,5 @@
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\bossbar\boss_bar_runs.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\main\model\shi_fo_at.java
-D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\main\run_.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\cuan_song\chuan_song.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\data\TeamManager.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\data\worldSpawnItem.java
@@ -11,9 +10,10 @@ D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\pCase
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\main\model\def_path.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\pCase\p_heath.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\command\command.java
-D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\pCase\run_.java
+D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\main\model_run_.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\pCase\p_IdName.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\print.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\bossbar\manger.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\run.java
+D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\player\pCase\pCase_run_.java
D:\project\java\mc_spring_1.20\守塔模式\src\main\java\org\start\command\commandTab.java