From c77e8065d319ec69036e9d22117815e9d5743235 Mon Sep 17 00:00:00 2001 From: SeanOMik Date: Mon, 20 Sep 2021 23:09:04 -0400 Subject: [PATCH] Add a way for certain gameplay related messages to get disabled --- 1_14_R1/pom.xml | 2 +- .../version_1_14_R1/EntityTamableFox.java | 16 ++++++++++++---- 1_15_R1/pom.xml | 2 +- .../version_1_15_R1/EntityTamableFox.java | 16 ++++++++++++---- 1_16_R1/pom.xml | 2 +- .../version_1_16_R1/EntityTamableFox.java | 16 ++++++++++++---- 1_16_R2/pom.xml | 2 +- .../version_1_16_R2/EntityTamableFox.java | 16 ++++++++++++---- 1_16_R3/pom.xml | 2 +- .../version_1_16_R3/EntityTamableFox.java | 16 ++++++++++++---- 1_17_1_R1/pom.xml | 2 +- .../version_1_17_1_R1/EntityTamableFox.java | 16 ++++++++++++---- 1_17_R1/pom.xml | 2 +- .../version_1_17_R1/EntityTamableFox.java | 16 ++++++++++++---- Plugin/pom.xml | 2 +- README.md | 8 +++++++- Utility/pom.xml | 2 +- .../tamablefoxes/util/io/LanguageConfig.java | 8 ++++---- pom.xml | 2 +- 19 files changed, 105 insertions(+), 43 deletions(-) diff --git a/1_14_R1/pom.xml b/1_14_R1/pom.xml index 9124931..72c9b97 100644 --- a/1_14_R1/pom.xml +++ b/1_14_R1/pom.xml @@ -7,7 +7,7 @@ tamablefoxes-parent net.seanomik - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT tamablefoxes_v1_14_R1 diff --git a/1_14_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_14_R1/EntityTamableFox.java b/1_14_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_14_R1/EntityTamableFox.java index 60deca0..727f30a 100644 --- a/1_14_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_14_R1/EntityTamableFox.java +++ b/1_14_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_14_R1/EntityTamableFox.java @@ -255,7 +255,9 @@ public class EntityTamableFox extends EntityFox { tamableFox.setCustomName(foxName); tamableFox.setCustomNameVisible(true); - plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) { + plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + } } return AnvilGUI.Response.close(); @@ -356,7 +358,9 @@ public class EntityTamableFox extends EntityFox { SQLiteHelper sqLiteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin); int maxTameCount = Config.getMaxPlayerFoxTames(); if ( !((Player) entityhuman.getBukkitEntity()).hasPermission("tamablefoxes.tame.unlimited") && maxTameCount > 0 && sqLiteHelper.getPlayerFoxAmount(entityhuman.getUniqueID()) >= maxTameCount) { - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + if (!LanguageConfig.getFoxDoesntTrust().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + } return true; } @@ -377,13 +381,17 @@ public class EntityTamableFox extends EntityFox { getBukkitEntity().getWorld().spawnParticle(org.bukkit.Particle.HEART, getBukkitEntity().getLocation(), 6, 0.5D, 0.5D, 0.5D); // Give player tamed message. - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + if (!LanguageConfig.getTamedMessage().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + } // Let the player choose the new fox's name if its enabled in config. if (Config.askForNameAfterTaming()) { Player player = (Player) entityhuman.getBukkitEntity(); - player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + if (!LanguageConfig.getTamingAskingName().equalsIgnoreCase("disabled")) { + player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + } rename(player); } } else { diff --git a/1_15_R1/pom.xml b/1_15_R1/pom.xml index 6f8e4ed..dde06a2 100644 --- a/1_15_R1/pom.xml +++ b/1_15_R1/pom.xml @@ -7,7 +7,7 @@ tamablefoxes-parent net.seanomik - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT tamablefoxes_v1_15_R1 diff --git a/1_15_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java b/1_15_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java index 09cad60..aad3b2d 100644 --- a/1_15_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java +++ b/1_15_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java @@ -255,7 +255,9 @@ public class EntityTamableFox extends EntityFox { tamableFox.setCustomName(foxName); tamableFox.setCustomNameVisible(true); - plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) { + plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + } } return AnvilGUI.Response.close(); @@ -356,7 +358,9 @@ public class EntityTamableFox extends EntityFox { SQLiteHelper sqLiteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin); int maxTameCount = Config.getMaxPlayerFoxTames(); if ( !((Player) entityhuman.getBukkitEntity()).hasPermission("tamablefoxes.tame.unlimited") && maxTameCount > 0 && sqLiteHelper.getPlayerFoxAmount(entityhuman.getUniqueID()) >= maxTameCount) { - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + if (!LanguageConfig.getFoxDoesntTrust().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + } return true; } @@ -377,13 +381,17 @@ public class EntityTamableFox extends EntityFox { getBukkitEntity().getWorld().spawnParticle(org.bukkit.Particle.HEART, getBukkitEntity().getLocation(), 6, 0.5D, 0.5D, 0.5D); // Give player tamed message. - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + if (!LanguageConfig.getTamedMessage().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + } // Let the player choose the new fox's name if its enabled in config. if (Config.askForNameAfterTaming()) { Player player = (Player) entityhuman.getBukkitEntity(); - player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + if (!LanguageConfig.getTamingAskingName().equalsIgnoreCase("disabled")) { + player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + } rename(player); } } else { diff --git a/1_16_R1/pom.xml b/1_16_R1/pom.xml index daa1f85..ce6b450 100644 --- a/1_16_R1/pom.xml +++ b/1_16_R1/pom.xml @@ -7,7 +7,7 @@ tamablefoxes-parent net.seanomik - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT tamablefoxes_v1_16_R1 diff --git a/1_16_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R1/EntityTamableFox.java b/1_16_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R1/EntityTamableFox.java index d9a150a..6edeb9d 100644 --- a/1_16_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R1/EntityTamableFox.java +++ b/1_16_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R1/EntityTamableFox.java @@ -253,7 +253,9 @@ public class EntityTamableFox extends EntityFox { tamableFox.setCustomName(foxName); tamableFox.setCustomNameVisible(true); - plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) { + plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + } } return AnvilGUI.Response.close(); @@ -357,7 +359,9 @@ public class EntityTamableFox extends EntityFox { SQLiteHelper sqLiteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin); int maxTameCount = Config.getMaxPlayerFoxTames(); if ( !((Player) entityhuman.getBukkitEntity()).hasPermission("tamablefoxes.tame.unlimited") && maxTameCount > 0 && sqLiteHelper.getPlayerFoxAmount(entityhuman.getUniqueID()) >= maxTameCount) { - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + if (!LanguageConfig.getFoxDoesntTrust().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + } return EnumInteractionResult.SUCCESS; } @@ -378,13 +382,17 @@ public class EntityTamableFox extends EntityFox { getBukkitEntity().getWorld().spawnParticle(org.bukkit.Particle.HEART, getBukkitEntity().getLocation(), 6, 0.5D, 0.5D, 0.5D); // Give player tamed message. - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + if (!LanguageConfig.getTamedMessage().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + } // Let the player choose the new fox's name if its enabled in config. if (Config.askForNameAfterTaming()) { Player player = (Player) entityhuman.getBukkitEntity(); - player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + if (!LanguageConfig.getTamingAskingName().equalsIgnoreCase("disabled")) { + player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + } rename(player); } } else { diff --git a/1_16_R2/pom.xml b/1_16_R2/pom.xml index 27a5a79..ecd99c2 100644 --- a/1_16_R2/pom.xml +++ b/1_16_R2/pom.xml @@ -7,7 +7,7 @@ tamablefoxes-parent net.seanomik - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT tamablefoxes_v1_16_R2 diff --git a/1_16_R2/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R2/EntityTamableFox.java b/1_16_R2/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R2/EntityTamableFox.java index e135e5d..52ca290 100644 --- a/1_16_R2/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R2/EntityTamableFox.java +++ b/1_16_R2/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R2/EntityTamableFox.java @@ -251,7 +251,9 @@ public class EntityTamableFox extends EntityFox { tamableFox.setCustomName(foxName); tamableFox.setCustomNameVisible(true); - plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) { + plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + } } return AnvilGUI.Response.close(); @@ -349,7 +351,9 @@ public class EntityTamableFox extends EntityFox { SQLiteHelper sqLiteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin); int maxTameCount = Config.getMaxPlayerFoxTames(); if ( !((Player) entityhuman.getBukkitEntity()).hasPermission("tamablefoxes.tame.unlimited") && maxTameCount > 0 && sqLiteHelper.getPlayerFoxAmount(entityhuman.getUniqueID()) >= maxTameCount) { - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + if (!LanguageConfig.getFoxDoesntTrust().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + } return EnumInteractionResult.SUCCESS; } @@ -370,13 +374,17 @@ public class EntityTamableFox extends EntityFox { getBukkitEntity().getWorld().spawnParticle(org.bukkit.Particle.HEART, getBukkitEntity().getLocation(), 6, 0.5D, 0.5D, 0.5D); // Give player tamed message. - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + if (!LanguageConfig.getTamedMessage().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + } // Let the player choose the new fox's name if its enabled in config. if (Config.askForNameAfterTaming()) { Player player = (Player) entityhuman.getBukkitEntity(); - player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + if (!LanguageConfig.getTamingAskingName().equalsIgnoreCase("disabled")) { + player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + } rename(player); } } else { diff --git a/1_16_R3/pom.xml b/1_16_R3/pom.xml index 2703179..179b6ee 100644 --- a/1_16_R3/pom.xml +++ b/1_16_R3/pom.xml @@ -7,7 +7,7 @@ net.seanomik tamablefoxes-parent - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT tamablefoxes_v1_16_R3 diff --git a/1_16_R3/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R3/EntityTamableFox.java b/1_16_R3/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R3/EntityTamableFox.java index e938c9d..75d5d24 100644 --- a/1_16_R3/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R3/EntityTamableFox.java +++ b/1_16_R3/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R3/EntityTamableFox.java @@ -251,7 +251,9 @@ public class EntityTamableFox extends EntityFox { tamableFox.setCustomName(foxName); tamableFox.setCustomNameVisible(true); - plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) { + plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + } } return AnvilGUI.Response.close(); @@ -349,7 +351,9 @@ public class EntityTamableFox extends EntityFox { SQLiteHelper sqLiteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin); int maxTameCount = Config.getMaxPlayerFoxTames(); if ( !((Player) entityhuman.getBukkitEntity()).hasPermission("tamablefoxes.tame.unlimited") && maxTameCount > 0 && sqLiteHelper.getPlayerFoxAmount(entityhuman.getUniqueID()) >= maxTameCount) { - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + if (!LanguageConfig.getFoxDoesntTrust().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + } return EnumInteractionResult.SUCCESS; } @@ -370,13 +374,17 @@ public class EntityTamableFox extends EntityFox { getBukkitEntity().getWorld().spawnParticle(org.bukkit.Particle.HEART, getBukkitEntity().getLocation(), 6, 0.5D, 0.5D, 0.5D); // Give player tamed message. - ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + if (!LanguageConfig.getTamedMessage().equalsIgnoreCase("disabled")) { + ((Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + } // Let the player choose the new fox's name if its enabled in config. if (Config.askForNameAfterTaming()) { Player player = (Player) entityhuman.getBukkitEntity(); - player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + if (!LanguageConfig.getTamingAskingName().equalsIgnoreCase("disabled")) { + player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + } rename(player); } } else { diff --git a/1_17_1_R1/pom.xml b/1_17_1_R1/pom.xml index 61e8ce2..0f32229 100644 --- a/1_17_1_R1/pom.xml +++ b/1_17_1_R1/pom.xml @@ -7,7 +7,7 @@ net.seanomik tamablefoxes-parent - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT diff --git a/1_17_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_1_R1/EntityTamableFox.java b/1_17_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_1_R1/EntityTamableFox.java index 1a0d8e0..250cf66 100644 --- a/1_17_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_1_R1/EntityTamableFox.java +++ b/1_17_1_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_1_R1/EntityTamableFox.java @@ -292,7 +292,9 @@ public class EntityTamableFox extends Fox { tamableFox.setCustomName(foxName); tamableFox.setCustomNameVisible(true); - plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) { + plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + } } return AnvilGUI.Response.close(); @@ -393,7 +395,9 @@ public class EntityTamableFox extends Fox { SQLiteHelper sqLiteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin); int maxTameCount = Config.getMaxPlayerFoxTames(); if ( !((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).hasPermission("tamablefoxes.tame.unlimited") && maxTameCount > 0 && sqLiteHelper.getPlayerFoxAmount(entityhuman.getUUID()) >= maxTameCount) { - ((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + if (!LanguageConfig.getFoxDoesntTrust().equalsIgnoreCase("disabled")) { + ((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + } return InteractionResult.SUCCESS; } @@ -412,11 +416,15 @@ public class EntityTamableFox extends Fox { getBukkitEntity().getWorld().spawnParticle(org.bukkit.Particle.HEART, getBukkitEntity().getLocation(), 6, 0.5D, 0.5D, 0.5D); // Give player tamed message. - ((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + if (!LanguageConfig.getTamedMessage().equalsIgnoreCase("disabled")) { + ((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + } // Let the player choose the new fox's name if its enabled in config. if (Config.askForNameAfterTaming()) { - player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + if (!LanguageConfig.getTamingAskingName().equalsIgnoreCase("disabled")) { + player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + } rename(player); } } else { diff --git a/1_17_R1/pom.xml b/1_17_R1/pom.xml index 5fb7d27..90c668a 100644 --- a/1_17_R1/pom.xml +++ b/1_17_R1/pom.xml @@ -7,7 +7,7 @@ net.seanomik tamablefoxes-parent - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT diff --git a/1_17_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_R1/EntityTamableFox.java b/1_17_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_R1/EntityTamableFox.java index a3fef47..d8013f8 100644 --- a/1_17_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_R1/EntityTamableFox.java +++ b/1_17_R1/src/main/java/net/seanomik/tamablefoxes/versions/version_1_17_R1/EntityTamableFox.java @@ -289,7 +289,9 @@ public class EntityTamableFox extends Fox { tamableFox.setCustomName(foxName); tamableFox.setCustomNameVisible(true); - plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + if (!LanguageConfig.getTamingChosenPerfect(input).equalsIgnoreCase("disabled")) { + plr.sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamingChosenPerfect(input)); + } } return AnvilGUI.Response.close(); @@ -390,7 +392,9 @@ public class EntityTamableFox extends Fox { SQLiteHelper sqLiteHelper = SQLiteHelper.getInstance(Utils.tamableFoxesPlugin); int maxTameCount = Config.getMaxPlayerFoxTames(); if ( !((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).hasPermission("tamablefoxes.tame.unlimited") && maxTameCount > 0 && sqLiteHelper.getPlayerFoxAmount(entityhuman.getUUID()) >= maxTameCount) { - ((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + if (!LanguageConfig.getFoxDoesntTrust().equalsIgnoreCase("disabled")) { + ((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getFoxDoesntTrust()); + } return InteractionResult.SUCCESS; } @@ -409,11 +413,15 @@ public class EntityTamableFox extends Fox { getBukkitEntity().getWorld().spawnParticle(org.bukkit.Particle.HEART, getBukkitEntity().getLocation(), 6, 0.5D, 0.5D, 0.5D); // Give player tamed message. - ((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + if (!LanguageConfig.getTamedMessage().equalsIgnoreCase("disabled")) { + ((org.bukkit.entity.Player) entityhuman.getBukkitEntity()).sendMessage(Config.getPrefix() + ChatColor.GREEN + LanguageConfig.getTamedMessage()); + } // Let the player choose the new fox's name if its enabled in config. if (Config.askForNameAfterTaming()) { - player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + if (!LanguageConfig.getTamingAskingName().equalsIgnoreCase("disabled")) { + player.sendMessage(Config.getPrefix() + ChatColor.RED + LanguageConfig.getTamingAskingName()); + } rename(player); } } else { diff --git a/Plugin/pom.xml b/Plugin/pom.xml index 8facfe9..19b8ae3 100644 --- a/Plugin/pom.xml +++ b/Plugin/pom.xml @@ -7,7 +7,7 @@ net.seanomik tamablefoxes-parent - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT tamablefoxes diff --git a/README.md b/README.md index cafc2d9..e05abbb 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,15 @@ Have you ever wanted to tame foxes? Well, now you can! Use chicken to tame net.seanomik tamablefoxes-parent - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT tamablefoxes-util diff --git a/Utility/src/main/java/net/seanomik/tamablefoxes/util/io/LanguageConfig.java b/Utility/src/main/java/net/seanomik/tamablefoxes/util/io/LanguageConfig.java index eb6b2f6..8e0babf 100644 --- a/Utility/src/main/java/net/seanomik/tamablefoxes/util/io/LanguageConfig.java +++ b/Utility/src/main/java/net/seanomik/tamablefoxes/util/io/LanguageConfig.java @@ -88,7 +88,7 @@ public class LanguageConfig extends YamlConfiguration { // This is the text that shows when registering the custom entity public static String getMCVersionLoading(String mcVersionStr) { - return config.getString("mc-version-loading").replaceAll("%MC_VERSION%", mcVersionStr); + return config.getString("mc-version-loading").replace("%MC_VERSION%", mcVersionStr); } // Get the error that shows during register when they try to run the plugin on an unsupported mc version. @@ -128,12 +128,12 @@ public class LanguageConfig extends YamlConfiguration { // Get the message when you give feed back on the new fox name. public static String getTamingChosenPerfect(String chosen) { - return config.getString("taming-chosen-name-perfect").replaceAll("%NEW_FOX_NAME%", chosen); + return config.getString("taming-chosen-name-perfect").replace("%NEW_FOX_NAME%", chosen); } // Get the fox name format. public static String getFoxNameFormat(String foxName, String ownerName) { - return config.getString((Config.doesShowOwnerInFoxName()) ? "fox-name-format" : "fox-name-no-owner-name-format").replaceAll("%FOX_NAME%", foxName).replaceAll("%OWNER%", ownerName); + return config.getString((Config.doesShowOwnerInFoxName()) ? "fox-name-format" : "fox-name-no-owner-name-format").replace("%FOX_NAME%", foxName).replace("%OWNER%", ownerName); } public static String getFoxDoesntTrust() { @@ -150,7 +150,7 @@ public class LanguageConfig extends YamlConfiguration { public static String getSpawnedFoxMessage(NMSInterface.FoxType type) { String typeStr = ((type == type.SNOW) ? ChatColor.AQUA + "Snow" : ChatColor.RED + "Red") + ChatColor.RESET; - return config.getString("spawned-fox-message").replaceAll("%TYPE%", typeStr); + return config.getString("spawned-fox-message").replace("%TYPE%", typeStr); } public static String getFailureSpawn() { diff --git a/pom.xml b/pom.xml index d1051ea..70acae8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.seanomik tamablefoxes-parent - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT pom