Browse Source

changing game-result config path

RedstoneFuture 3 years ago
parent
commit
55a62674c4

+ 10 - 10
missilewars-plugin/src/main/java/de/butzlabben/missilewars/MessageConfig.java

@@ -93,16 +93,16 @@ public class MessageConfig {
         cfg.addDefault("fall_protection_deactivated", "&cFall protection deactivated by sneaking");
         cfg.addDefault("fall_protection_deactivated", "&cFall protection deactivated by sneaking");
 
 
         cfg.addDefault("money", "You received &e%money% &7coins");
         cfg.addDefault("money", "You received &e%money% &7coins");
-        cfg.addDefault("kick_inactivity", "&cYou were inactive on missilewars");
-
-        cfg.addDefault("title_won", "%team%");
-        cfg.addDefault("subtitle_won", "&7has won the game");
-        cfg.addDefault("title_winner", "You");
-        cfg.addDefault("subtitle_winner", "&7have won");
-        cfg.addDefault("title_loser", "You");
-        cfg.addDefault("subtitle_loser", "&7have lost");
-        cfg.addDefault("title_draw", "Draw!");
-        cfg.addDefault("subtitle_draw", "");
+        cfg.addDefault("kick_inactivity", "&cYou were inactive on MissileWars");
+
+        cfg.addDefault("game_result.title_won", "%team%");
+        cfg.addDefault("game_result.subtitle_won", "&7has won the game");
+        cfg.addDefault("game_result.title_winner", "You");
+        cfg.addDefault("game_result.subtitle_winner", "&7have won");
+        cfg.addDefault("game_result.title_loser", "You");
+        cfg.addDefault("game_result.subtitle_loser", "&7have lost");
+        cfg.addDefault("game_result.title_draw", "Draw!");
+        cfg.addDefault("game_result.subtitle_draw", "");
 
 
         cfg.addDefault("spectator", "&7You are now a spectator");
         cfg.addDefault("spectator", "&7You are now a spectator");
         cfg.addDefault("change_team_not_now", "&cNow you cannot change your team anymore");
         cfg.addDefault("change_team_not_now", "&cNow you cannot change your team anymore");

+ 7 - 7
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -544,23 +544,23 @@ public class Game {
 
 
     /**
     /**
      * This method sends the players the title / subtitle of the
      * This method sends the players the title / subtitle of the
-     * game result there are not in a team (=spectator).
+     * game result there are not in a team (= spectator).
      */
      */
     public void sendNeutralGameResultTitle(Player player) {
     public void sendNeutralGameResultTitle(Player player) {
         String title;
         String title;
         String subTitle;
         String subTitle;
 
 
         if (team1.getGameResult() == GameResult.WIN) {
         if (team1.getGameResult() == GameResult.WIN) {
-            title = MessageConfig.getNativeMessage("title_won").replace("%team%", team1.getName());
-            subTitle = MessageConfig.getNativeMessage("subtitle_won");
+            title = MessageConfig.getNativeMessage("game_result.title_won").replace("%team%", team1.getName());
+            subTitle = MessageConfig.getNativeMessage("game_result.subtitle_won");
 
 
         } else if (team2.getGameResult() == GameResult.WIN) {
         } else if (team2.getGameResult() == GameResult.WIN) {
-            title = MessageConfig.getNativeMessage("title_won").replace("%team%", team2.getName());
-            subTitle = MessageConfig.getNativeMessage("subtitle_won");
+            title = MessageConfig.getNativeMessage("game_result.title_won").replace("%team%", team2.getName());
+            subTitle = MessageConfig.getNativeMessage("game_result.subtitle_won");
 
 
         } else {
         } else {
-            title = MessageConfig.getNativeMessage("title_draw");
-            subTitle = MessageConfig.getNativeMessage("subtitle_draw");
+            title = MessageConfig.getNativeMessage("game_result.title_draw");
+            subTitle = MessageConfig.getNativeMessage("game_result.subtitle_draw");
 
 
         }
         }
 
 

+ 7 - 8
missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/game/Team.java

@@ -30,6 +30,7 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.ToString;
+import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.Color;
 import org.bukkit.Location;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Material;
@@ -39,8 +40,6 @@ import org.bukkit.inventory.meta.LeatherArmorMeta;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 
 
-import java.util.ArrayList;
-
 /**
 /**
  * @author Butzlabben
  * @author Butzlabben
  * @since 01.01.2018
  * @since 01.01.2018
@@ -200,16 +199,16 @@ public class Team {
 
 
         switch (gameResult) {
         switch (gameResult) {
             case WIN:
             case WIN:
-                title = MessageConfig.getNativeMessage("title_winner");
-                subTitle = MessageConfig.getNativeMessage("subtitle_winner");
+                title = MessageConfig.getNativeMessage("game_result.title_winner");
+                subTitle = MessageConfig.getNativeMessage("game_result.subtitle_winner");
                 break;
                 break;
             case LOSE:
             case LOSE:
-                title = MessageConfig.getNativeMessage("title_loser");
-                subTitle = MessageConfig.getNativeMessage("subtitle_loser");
+                title = MessageConfig.getNativeMessage("game_result.title_loser");
+                subTitle = MessageConfig.getNativeMessage("game_result.subtitle_loser");
                 break;
                 break;
             case DRAW:
             case DRAW:
-                title = MessageConfig.getNativeMessage("title_draw");
-                subTitle = MessageConfig.getNativeMessage("subtitle_draw");
+                title = MessageConfig.getNativeMessage("game_result.title_draw");
+                subTitle = MessageConfig.getNativeMessage("game_result.subtitle_draw");
                 break;
                 break;
             default:
             default:
                 title = null;
                 title = null;