Merge pull request #29 from MrEAlderson/master

Various changes
MetallicGoat · Jun 30, 2024 · 9a17b97 · 9a17b97
2 parents 9f6873f + f0eba83
commit 9a17b97
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 53 deletions.
diff --git a/pom.xml b/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.32</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/me/metallicgoat/tweaksaddon/config/ConfigLegacyMigrator.java b/src/main/java/me/metallicgoat/tweaksaddon/config/ConfigLegacyMigrator.java
@@ -1,6 +1,5 @@
 package me.metallicgoat.tweaksaddon.config;
 
-import de.marcely.bedwars.api.arena.Team;
 import de.marcely.bedwars.api.game.spawner.DropType;
 import de.marcely.bedwars.tools.Helper;
 import de.marcely.bedwars.tools.VarParticle;
@@ -9,7 +8,6 @@
 import java.util.List;
 import me.metallicgoat.tweaksaddon.utils.Console;
 import me.metallicgoat.tweaksaddon.utils.Util;
-import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -247,30 +245,6 @@ public static void loadOldMain(FileConfiguration config) {
       }
     }
 
-    MainConfig.custom_team_colors_enabled = config.getBoolean("Custom-Team-Chat-Color.Enabled", false);
-    {
-      if (config.contains("Custom-Team-Chat-Color.Teams")) {
-
-        final HashMap<Team, ChatColor> map = new HashMap<>();
-
-        for (String string : config.getStringList("Custom-Team-Chat-Color.Teams")) {
-
-          if (!string.contains(":"))
-            continue;
-
-          final String[] strings = string.split(":");
-          final Team team = Team.getByName(strings[0]);
-          final ChatColor chatColor = ChatColor.getByChar(strings[1].charAt(0));
-
-          if (team != null && chatColor != null) {
-            map.put(team, chatColor);
-          }
-        }
-
-        MainConfig.custom_team_colors = map;
-      }
-    }
-
     MainConfig.permanent_effects_enabled = config.getBoolean("Permanent-Effects.Enabled", false);
     loadPermanentEffects(config, "Permanent-Effects.Effects");
 

diff --git a/src/main/java/me/metallicgoat/tweaksaddon/config/ConfigLoader.java b/src/main/java/me/metallicgoat/tweaksaddon/config/ConfigLoader.java
@@ -1,6 +1,5 @@
 package me.metallicgoat.tweaksaddon.config;
 
-import de.marcely.bedwars.api.arena.Team;
 import de.marcely.bedwars.api.configuration.ConfigurationAPI;
 import de.marcely.bedwars.api.event.ConfigsLoadEvent;
 import de.marcely.bedwars.tools.Helper;
@@ -10,15 +9,13 @@
 import me.metallicgoat.tweaksaddon.gentiers.TierAction;
 import me.metallicgoat.tweaksaddon.utils.Console;
 import me.metallicgoat.tweaksaddon.utils.Util;
-import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Map.Entry;
 
 public class ConfigLoader implements Listener {
 
@@ -58,8 +55,6 @@ public static void loadTweaksConfigs(MBedwarsTweaksPlugin plugin) {
     ConfigManager.load(plugin, SwordsToolsConfig.class, FileType.SWORDS_TOOLS);
     GenTiersConfig.load(); // We load gen tiers a special way
 
-    applyCustomTeamColors();
-
     overrideMBedwarsConfigs();
 
     final long end = System.currentTimeMillis();
@@ -107,14 +102,6 @@ public static HashMap<Integer, GenTierLevel> getDefaultGenTiers() {
     }};
   }
 
-  private static void applyCustomTeamColors() {
-    if (!MainConfig.custom_team_colors_enabled)
-      return;
-
-    for (Entry<Team, ChatColor> entry : MainConfig.custom_team_colors.entrySet())
-      entry.getKey().setBungeeChatColor(entry.getValue());
-  }
-
   private static void overrideMBedwarsConfigs() {
     // Configure MBedwars to work like our old feature did
     if (MainConfig.personal_ender_chests_enabled) {

diff --git a/src/main/java/me/metallicgoat/tweaksaddon/config/MainConfig.java b/src/main/java/me/metallicgoat/tweaksaddon/config/MainConfig.java
@@ -1,6 +1,5 @@
 package me.metallicgoat.tweaksaddon.config;
 
-import de.marcely.bedwars.api.arena.Team;
 import de.marcely.bedwars.api.game.spawner.DropType;
 import de.marcely.bedwars.tools.Helper;
 import de.marcely.bedwars.tools.NMSHelper;
@@ -13,7 +12,6 @@
 import lombok.Getter;
 import me.metallicgoat.tweaksaddon.config.ConfigManager.Config;
 import me.metallicgoat.tweaksaddon.config.ConfigManager.SectionTitle;
-import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.potion.PotionEffect;
@@ -358,17 +356,6 @@ public class MainConfig {
   public static boolean block_stat_change_enabled = false;
   @Config public static List<String> block_stat_change_arenas = new ArrayList<>();
 
-  @Config(
-      description = {
-          "Change default team chat colors",
-          "Add teams like: \"DefaultTeamName: ChatColorName\"",
-      }
-  )
-  public static boolean custom_team_colors_enabled = false;
-  @Config public static HashMap<Team, ChatColor> custom_team_colors = new HashMap<Team, ChatColor>() {{
-    put(Team.CYAN, ChatColor.DARK_AQUA);
-  }};
-
   @Config(
       description = {
           "Permanent effects players have while playing",