From eda46398a9c075eec5ace20bb1df5fbab5f83db1 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 20 Jun 2017 05:44:31 +1200 Subject: [PATCH] Force everyone to use translations, THEN TAKE IT AWAY --- plugin.yml | 8 +- .../disguise/utilities/LibsMsg.java | 234 ++++++++++-------- .../disguise/utilities/TranslateFiller.java | 22 +- .../disguise/utilities/TranslateType.java | 35 ++- 4 files changed, 175 insertions(+), 124 deletions(-) diff --git a/plugin.yml b/plugin.yml index e4d73461..4b161982 100644 --- a/plugin.yml +++ b/plugin.yml @@ -54,19 +54,19 @@ commands: permission: libsdisguises.seecmd.viewself description: Toggle seeing your own disguise on or off. disguisemodify: - aliases: [dmodify] + aliases: [dmodify, dmod] permission: libsdisguises.seecmd.disguisemodify description: Modify your own disguise disguisemodifyplayer: - aliases: [dmodifyplayer] + aliases: [dmodifyplayer, dmodplayer] permission: libsdisguises.seecmd.disguisemodifyplayer description: Modify the disguise of a player disguisemodifyradius: - aliases: [dmodifyradius] + aliases: [dmodifyradius, dmodradius] permission: libsdisguises.seecmd.disguisemodifyradius description: Modify disguises in a radius disguisemodifyentity: - aliases: [dmodifyentity] + aliases: [dmodifyentity, dmodentity] permission: libsdisguises.seecmd.disguisemodifyentity description: Modify a disguise by right clicking them diff --git a/src/me/libraryaddict/disguise/utilities/LibsMsg.java b/src/me/libraryaddict/disguise/utilities/LibsMsg.java index 35b21397..3725a882 100644 --- a/src/me/libraryaddict/disguise/utilities/LibsMsg.java +++ b/src/me/libraryaddict/disguise/utilities/LibsMsg.java @@ -9,130 +9,148 @@ import java.util.ArrayList; * Created by libraryaddict on 15/06/2017. */ public enum LibsMsg { - // Format being CLASS_STRING. So no perm = DISG_COMMAND_NO_PERM. Or DISG_PARSE_NO_PERM_OPTION - DHELP_OPTIONS("%s options: %s"), NO_PERMS_USE_OPTIONS( - ChatColor.RED + "Ignored %s options you do not have permission to use. Add 'show' to view unusable options."), - DISG_HELP4(ChatColor.DARK_GREEN + "/disguise "), - DHELP_CANTFIND(ChatColor.RED + "Cannot find the disguise %s"), - NO_PERM_DISGUISE(ChatColor.RED + "You do not have permission for that disguise!"), - DISG_ENT_HELP1(ChatColor.DARK_GREEN + "Choose a disguise then right click an entity to disguise it!"), - DISG_ENT_HELP3(ChatColor.DARK_GREEN + "/disguiseentity player "), - DISG_ENT_HELP4(ChatColor.DARK_GREEN + "/disguiseentity "), - DISG_ENT_HELP5(ChatColor.DARK_GREEN + "/disguiseentity "), - DISG_ENT_CLICK(ChatColor.RED + "Right click an entity in the next %s seconds to disguise it as a %s!"), - DISG_HELP3(ChatColor.DARK_GREEN + "/disguise "), - DMODRADIUS(ChatColor.RED + "Successfully modified the disguises of %s entities!"), - DMODRADIUS_NOENTS(ChatColor.RED + "Couldn't find any disguised entities!"), - DMODRADIUS_NOPERM(ChatColor.RED + "No permission to modify %s disguises!"), - DISG_HELP2(ChatColor.DARK_GREEN + "/disguise player "), - DISG_HELP1(ChatColor.DARK_GREEN + "Choose a disguise to become the disguise!"), + BLOWN_DISGUISE(ChatColor.RED + "Your disguise was blown!"), CAN_USE_DISGS(ChatColor.DARK_GREEN + "You can use the disguises: %s"), - DISGUISED(ChatColor.RED + "Now disguised as a %s"), - DHELP_HELP2(ChatColor.RED + "/disguisehelp %s" + ChatColor.GREEN + " - %s"), DHELP_HELP1( - ChatColor.RED + "/disguisehelp " + ChatColor.GREEN + "- View the options you can set on a disguise. Add 'show' to reveal the options you don't have permission to use"), - FAILED_DISGIUSE(ChatColor.RED + "Failed to disguise as a %s"), CLONE_HELP1( + CANNOT_FIND_PLAYER(ChatColor.RED + "Cannot find the player '%s'"), + CLICK_TIMER(ChatColor.RED + "Right click a entity in the next %s seconds to grab the disguise reference!"), + CLONE_HELP1( ChatColor.DARK_GREEN + "Right click a entity to get a disguise reference you can pass to other disguise commands!"), CLONE_HELP2( ChatColor.DARK_GREEN + "Security note: Any references you create will be available to all players able to use disguise references."), CLONE_HELP3( ChatColor.DARK_GREEN + "/disguiseclone IgnoreEquipment" + ChatColor.DARK_GREEN + "(" + ChatColor.GREEN + "Optional" + ChatColor.DARK_GREEN + ")"), - RELOADED_CONFIG(ChatColor.GREEN + "[LibsDisguises] Reloaded config."), - DMODIFY_NO_PERM(ChatColor.RED + "No permission to modify your disguise!"), - DMODIFY_MODIFIED(ChatColor.RED + "Your disguise has been modified!"), - DMODIFY_HELP1(ChatColor.DARK_GREEN + "Modify your own disguise as you wear it!"), - DMODIFY_HELP2(ChatColor.DARK_GREEN + "/disguisemodify setBaby true setSprinting true"), - DMODIFY_HELP3(ChatColor.DARK_GREEN + "You can modify the disguises: %s"), - DMODIFYENT_CLICK(ChatColor.RED + "Right click a disguised entity in the next %s seconds to modify their disguise!"), - LIBS_RELOAD_WRONG(ChatColor.RED + "[LibsDisguises] Did you mean 'reload'?"), - DMODENT_HELP1(ChatColor.DARK_GREEN + "Choose the options for a disguise then right click a entity to modify it!"), - CANNOT_FIND_PLAYER(ChatColor.RED + "Cannot find the player '%s'"), - PARSE_USE_SECOND_NUM(ChatColor.RED + "Error! Only the disguises %s and %s uses a second number!"), - PARSE_NO_PERM_PARAM( - ChatColor.RED + "Error! You do not have permission to use the parameter %s on the %s disguise!"), - PARSE_NO_OPTION_VALUE(ChatColor.RED + "No value was given for the option %s"), - PARSE_OPTION_NA(ChatColor.RED + "Cannot find the option %s"), UPDATE_READY( - ChatColor.RED + "[LibsDisguises] " + ChatColor.DARK_RED + "There is a update ready to be downloaded! You are using " + ChatColor.RED + "v%s" + ChatColor.DARK_RED + ", the new version is " + ChatColor.RED + "%s" + ChatColor.DARK_RED + "!"), - PARSE_EXPECTED_RECEIVED( - ChatColor.RED + "Expected " + ChatColor.GREEN + "%s" + ChatColor.RED + ", received " + ChatColor.GREEN + "%s" + ChatColor.RED + " instead for " + ChatColor.GREEN + "%s"), - DRADIUS_ENTITIES(ChatColor.DARK_GREEN + "EntityTypes usable are: %s"), - PARSE_TOO_MANY_ARGS(ChatColor.RED + "Error! %s doesn't know what to do with %s!"), - DISG_PLAYER_AS_DISG(ChatColor.RED + "Successfully disguised %s as a %s!"), - PARSE_NO_PERM_NAME(ChatColor.RED + "Error! You don't have permission to use that name!"), - DPLAYER_SUPPLY(ChatColor.RED + "You need to supply a disguise as well as the player"), - PARSE_SUPPLY_PLAYER(ChatColor.RED + "Error! You need to give a player name!"), - DISG_PLAYER_AS_DISG_FAIL(ChatColor.RED + "Failed to disguise %s as a %s!"), DISABLED_LIVING_TO_MISC( - ChatColor.RED + "Can't disguise a living entity as a misc disguise. This has been disabled in the config!"), - DMODRADIUS_HELP1(ChatColor.DARK_GREEN + "Modify the disguises in a radius! Caps at %s blocks!"), DMODRADIUS_HELP3( - (ChatColor.DARK_GREEN + "/disguisemodifyradius player ") - .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DMODRADIUS_HELP4( - (ChatColor.DARK_GREEN + "/disguisemodifyradius ") - .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DMODRADIUS_HELP5( - (ChatColor.DARK_GREEN + "/disguisemodifyradius ") - .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DMODRADIUS_HELP6( - ChatColor.DARK_GREEN + "See the EntityType's usable by " + ChatColor.GREEN + "/disguisemodifyradius EntityTypes"), - UND_ENTITY(ChatColor.RED + "Right click a disguised entity to undisguise them!"), - UNDISG_PLAYER(ChatColor.RED + "%s is no longer disguised"), - LISTEN_ENTITY_PLAYER_DISG_PLAYER(ChatColor.RED + "Disguised the player %s as the player %s!"), - LISTEN_ENTITY_PLAYER_DISG_ENTITY(ChatColor.RED + "Disguised the player %s as a %s!"), - LISTEN_ENTITY_ENTITY_DISG_PLAYER(ChatColor.RED + "Disguised s %s as the player %s!"), - LISTEN_ENTITY_ENTITY_DISG_ENTITY(ChatColor.RED + "Disguised s %s as a %s!"), - LISTEN_ENTITY_PLAYER_DISG_PLAYER_FAIL(ChatColor.RED + "Failed to disguise the player %s as the player %s!"), - LISTEN_ENTITY_PLAYER_DISG_ENTITY_FAIL(ChatColor.RED + "Failed to disguise the player %s as a %s!"), - LISTEN_ENTITY_ENTITY_DISG_PLAYER_FAIL(ChatColor.RED + "Failed to disguise s %s as the player %s!"), - LISTEN_ENTITY_ENTITY_DISG_ENTITY_FAIL(ChatColor.RED + "Failed to disguise s %s as a %s!"), - LISTEN_UNDISG_PLAYER(ChatColor.RED + "Undisguised %s"), LISTEN_UNDISG_ENT(ChatColor.RED + "Undisguised the %s"), - LISTEN_UNDISG_PLAYER_FAIL(ChatColor.RED + "The %s isn't disguised!"), - MADE_REF(ChatColor.RED + "Constructed a %s disguise! Your reference is %s"), - MADE_REF_EXAMPLE(ChatColor.RED + "Example usage: /disguise %s"), REF_TOO_MANY( - ChatColor.RED + "Failed to store the reference, too many cloned disguises. Please raise the maximum cloned disguises, or lower the time they last"), - LISTEN_UNDISG_ENT_FAIL(ChatColor.RED + "%s isn't disguised!"), - UNDISG_PLAYER_FAIL(ChatColor.RED + "%s not disguised!"), - UNDISG_PLAYER_HELP(ChatColor.RED + "/undisguiseplayer "), - DMODPLAYER_NODISGUISE(ChatColor.RED + "The player '%s' is not disguised"), - DMODPLAYER_NOPERM(ChatColor.RED + "You do not have permission to modify this disguise"), - DMODPLAYER_MODIFIED(ChatColor.RED + "Modified the disguise of %s!"), - LISTENER_MODIFIED_DISG(ChatColor.RED + "Modified the disguise!"), - DMODPLAYER_HELP1(ChatColor.DARK_GREEN + "Modify the disguise of another player!"), - NO_PERM(ChatColor.RED + "You are forbidden to use this command."), - NOT_DISGUISED(ChatColor.RED + "You are not disguised!"), - DRADIUS_HELP1(ChatColor.DARK_GREEN + "Disguise all entities in a radius! Caps at %s blocks!"), DRADIUS_HELP3( - (ChatColor.DARK_GREEN + "/disguiseradius player ") - .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DRADIUS_HELP4( - (ChatColor.DARK_GREEN + "/disguiseradius ") - .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DRADIUS_HELP5( - (ChatColor.DARK_GREEN + "/disguiseradius ") - .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), DRADIUS_HELP6( - ChatColor.DARK_GREEN + "See the EntityType's usable by " + ChatColor.GREEN + "/disguiseradius EntityTypes"), - D_PARSE_NOPERM(ChatColor.RED + "You do not have permission to use the option %s"), - PARSE_NO_ARGS("No arguments defined"), - PARSE_NO_REF(ChatColor.RED + "Cannot find a disguise under the reference %s"), - PARSE_NO_PERM_REF(ChatColor.RED + "You do not have perimssion to use disguise references!"), PARSE_DISG_NO_EXIST( - ChatColor.RED + "Error! The disguise " + ChatColor.GREEN + "%s" + ChatColor.RED + " doesn't exist!"), - PARSE_CANT_DISG_UNKNOWN(ChatColor.RED + "Error! You cannot disguise as " + ChatColor.GREEN + "Unknown!"), - PARSE_CANT_LOAD(ChatColor.RED + "Error! This disguise couldn't be loaded!"), D_HELP1(ChatColor.DARK_GREEN + "Disguise another player!"), - DMODRADIUS_USABLE(ChatColor.DARK_GREEN + "EntityTypes usable are: %s" + ChatColor.DARK_GREEN + "."), D_HELP3(ChatColor.DARK_GREEN + "/disguiseplayer player "), D_HELP4(ChatColor.DARK_GREEN + "/disguiseplayer "), D_HELP5(ChatColor.DARK_GREEN + "/disguiseplayer "), - DMODRADIUS_UNRECOGNIZED(ChatColor.RED + "Unrecognised EntityType %s"), + D_PARSE_NOPERM(ChatColor.RED + "You do not have permission to use the option %s"), + DHELP_CANTFIND(ChatColor.RED + "Cannot find the disguise %s"), + DHELP_HELP1( + ChatColor.RED + "/disguisehelp " + ChatColor.GREEN + "- View the options you can set on a disguise. Add 'show' to reveal the options you don't have permission to use"), + DHELP_HELP2(ChatColor.RED + "/disguisehelp %s" + ChatColor.GREEN + " - %s"), + DHELP_OPTIONS("%s options: %s"), + DISABLED_LIVING_TO_MISC( + ChatColor.RED + "Can't disguise a living entity as a misc disguise. This has been disabled in the config!"), + DISG_ENT_CLICK(ChatColor.RED + "Right click an entity in the next %s seconds to disguise it as a %s!"), + DISG_ENT_HELP1(ChatColor.DARK_GREEN + "Choose a disguise then right click an entity to disguise it!"), + DISG_ENT_HELP3(ChatColor.DARK_GREEN + "/disguiseentity player "), + DISG_ENT_HELP4(ChatColor.DARK_GREEN + "/disguiseentity "), + DISG_ENT_HELP5(ChatColor.DARK_GREEN + "/disguiseentity "), + DISG_HELP1(ChatColor.DARK_GREEN + "Choose a disguise to become the disguise!"), + DISG_HELP2(ChatColor.DARK_GREEN + "/disguise player "), + DISG_HELP3(ChatColor.DARK_GREEN + "/disguise "), + DISG_HELP4(ChatColor.DARK_GREEN + "/disguise "), + DISG_PLAYER_AS_DISG(ChatColor.RED + "Successfully disguised %s as a %s!"), + DISG_PLAYER_AS_DISG_FAIL(ChatColor.RED + "Failed to disguise %s as a %s!"), + DISGUISED(ChatColor.RED + "Now disguised as a %s"), + DISRADIUS(ChatColor.RED + "Successfully disguised %s entities!"), + DISRADIUS_FAIL(ChatColor.RED + "Couldn't find any entities to disguise!"), + DMODENT_HELP1(ChatColor.DARK_GREEN + "Choose the options for a disguise then right click a entity to modify it!"), + DMODIFY_HELP1(ChatColor.DARK_GREEN + "Modify your own disguise as you wear it!"), + DMODIFY_HELP2(ChatColor.DARK_GREEN + "/disguisemodify setBaby true setSprinting true"), + DMODIFY_HELP3(ChatColor.DARK_GREEN + "You can modify the disguises: %s"), + DMODIFY_MODIFIED(ChatColor.RED + "Your disguise has been modified!"), + DMODIFY_NO_PERM(ChatColor.RED + "No permission to modify your disguise!"), + DMODIFYENT_CLICK(ChatColor.RED + "Right click a disguised entity in the next %s seconds to modify their disguise!"), + DMODPLAYER_HELP1(ChatColor.DARK_GREEN + "Modify the disguise of another player!"), + DMODPLAYER_MODIFIED(ChatColor.RED + "Modified the disguise of %s!"), + DMODPLAYER_NODISGUISE(ChatColor.RED + "The player '%s' is not disguised"), + DMODPLAYER_NOPERM(ChatColor.RED + "You do not have permission to modify this disguise"), + DMODRADIUS(ChatColor.RED + "Successfully modified the disguises of %s entities!"), + DMODRADIUS_HELP1(ChatColor.DARK_GREEN + "Modify the disguises in a radius! Caps at %s blocks!"), + DMODRADIUS_HELP3( + (ChatColor.DARK_GREEN + "/disguisemodifyradius player ") + .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), + DMODRADIUS_HELP4( + (ChatColor.DARK_GREEN + "/disguisemodifyradius ") + .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), + DMODRADIUS_HELP5( + (ChatColor.DARK_GREEN + "/disguisemodifyradius ") + .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), + DMODRADIUS_HELP6( + ChatColor.DARK_GREEN + "See the EntityType's usable by " + ChatColor.GREEN + "/disguisemodifyradius EntityTypes"), DMODRADIUS_NEEDOPTIONS(ChatColor.RED + "You need to supply the disguise options as well as the radius"), + DMODRADIUS_NEEDOPTIONS_ENTITY( + ChatColor.RED + "You need to supply the disguise options as well as the radius and EntityType"), + DMODRADIUS_NOENTS(ChatColor.RED + "Couldn't find any disguised entities!"), + DMODRADIUS_NOPERM(ChatColor.RED + "No permission to modify %s disguises!"), + DMODRADIUS_UNRECOGNIZED(ChatColor.RED + "Unrecognised EntityType %s"), + DMODRADIUS_USABLE(ChatColor.DARK_GREEN + "EntityTypes usable are: %s" + ChatColor.DARK_GREEN + "."), + DPLAYER_SUPPLY(ChatColor.RED + "You need to supply a disguise as well as the player"), + DRADIUS_ENTITIES(ChatColor.DARK_GREEN + "EntityTypes usable are: %s"), + DRADIUS_HELP1(ChatColor.DARK_GREEN + "Disguise all entities in a radius! Caps at %s blocks!"), + DRADIUS_HELP3( + (ChatColor.DARK_GREEN + "/disguiseradius player ") + .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), + DRADIUS_HELP4( + (ChatColor.DARK_GREEN + "/disguiseradius ") + .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), + DRADIUS_HELP5( + (ChatColor.DARK_GREEN + "/disguiseradius ") + .replace("<", "<" + ChatColor.GREEN).replace(">", ChatColor.DARK_GREEN + ">")), + DRADIUS_HELP6( + ChatColor.DARK_GREEN + "See the EntityType's usable by " + ChatColor.GREEN + "/disguiseradius EntityTypes"), + DRADIUS_MISCDISG( + ChatColor.RED + "Failed to disguise %s entities because the option to disguise a living entity as a non-living has been disabled in the config"), DRADIUS_NEEDOPTIONS(ChatColor.RED + "You need to supply a disguise as well as the radius"), DRADIUS_NEEDOPTIONS_ENTITY(ChatColor.RED + "You need to supply a disguise as well as the radius and EntityType"), - NOT_NUMBER(ChatColor.RED + "Error! %s is not a number"), DRADIUS_MISCDISG( - ChatColor.RED + "Failed to disguise %s entities because the option to disguise a living entity as a non-living has been disabled in the config"), + FAILED_DISGIUSE(ChatColor.RED + "Failed to disguise as a %s"), + INVALID_CLONE( + ChatColor.DARK_RED + "Unknown option '%s' - Valid options are 'IgnoreEquipment' 'DoSneakSprint' " + "'DoSneak' 'DoSprint'"), + LIBS_RELOAD_WRONG(ChatColor.RED + "[LibsDisguises] Did you mean 'reload'?"), LIMITED_RADIUS(ChatColor.RED + "Limited radius to %s! Don't want to make too much lag right?"), - DISRADIUS(ChatColor.RED + "Successfully disguised %s entities!"), - DISRADIUS_FAIL(ChatColor.RED + "Couldn't find any entities to disguise!"), DMODRADIUS_NEEDOPTIONS_ENTITY( - ChatColor.RED + "You need to supply the disguise options as well as the radius and EntityType"), + LISTEN_ENTITY_ENTITY_DISG_ENTITY(ChatColor.RED + "Disguised s %s as a %s!"), + LISTEN_ENTITY_ENTITY_DISG_ENTITY_FAIL(ChatColor.RED + "Failed to disguise s %s as a %s!"), + LISTEN_ENTITY_ENTITY_DISG_PLAYER(ChatColor.RED + "Disguised s %s as the player %s!"), + LISTEN_ENTITY_ENTITY_DISG_PLAYER_FAIL(ChatColor.RED + "Failed to disguise s %s as the player %s!"), + LISTEN_ENTITY_PLAYER_DISG_ENTITY(ChatColor.RED + "Disguised the player %s as a %s!"), + LISTEN_ENTITY_PLAYER_DISG_ENTITY_FAIL(ChatColor.RED + "Failed to disguise the player %s as a %s!"), + LISTEN_ENTITY_PLAYER_DISG_PLAYER(ChatColor.RED + "Disguised the player %s as the player %s!"), + LISTEN_ENTITY_PLAYER_DISG_PLAYER_FAIL(ChatColor.RED + "Failed to disguise the player %s as the player %s!"), + LISTEN_UNDISG_ENT(ChatColor.RED + "Undisguised the %s"), + LISTEN_UNDISG_ENT_FAIL(ChatColor.RED + "%s isn't disguised!"), + LISTEN_UNDISG_PLAYER(ChatColor.RED + "Undisguised %s"), + LISTEN_UNDISG_PLAYER_FAIL(ChatColor.RED + "The %s isn't disguised!"), + LISTENER_MODIFIED_DISG(ChatColor.RED + "Modified the disguise!"), + MADE_REF(ChatColor.RED + "Constructed a %s disguise! Your reference is %s"), + MADE_REF_EXAMPLE(ChatColor.RED + "Example usage: /disguise %s"), NO_CONSOLE(ChatColor.RED + "You may not use this command from the console!"), - CLICK_TIMER(ChatColor.RED + "Right click a entity in the next %s seconds to grab the disguise reference!"), - UNDISRADIUS(ChatColor.RED + "Successfully undisguised %s entities!"), + NO_PERM(ChatColor.RED + "You are forbidden to use this command."), + NO_PERM_DISGUISE(ChatColor.RED + "You do not have permission for that disguise!"), + NO_PERMS_USE_OPTIONS( + ChatColor.RED + "Ignored %s options you do not have permission to use. Add 'show' to view unusable options."), + NOT_DISGUISED(ChatColor.RED + "You are not disguised!"), + NOT_NUMBER(ChatColor.RED + "Error! %s is not a number"), + PARSE_CANT_DISG_UNKNOWN(ChatColor.RED + "Error! You cannot disguise as " + ChatColor.GREEN + "Unknown!"), + PARSE_CANT_LOAD(ChatColor.RED + "Error! This disguise couldn't be loaded!"), + PARSE_DISG_NO_EXIST( + ChatColor.RED + "Error! The disguise " + ChatColor.GREEN + "%s" + ChatColor.RED + " doesn't exist!"), + PARSE_EXPECTED_RECEIVED( + ChatColor.RED + "Expected " + ChatColor.GREEN + "%s" + ChatColor.RED + ", received " + ChatColor.GREEN + "%s" + ChatColor.RED + " instead for " + ChatColor.GREEN + "%s"), + PARSE_NO_ARGS("No arguments defined"), + PARSE_NO_OPTION_VALUE(ChatColor.RED + "No value was given for the option %s"), + PARSE_NO_PERM_NAME(ChatColor.RED + "Error! You don't have permission to use that name!"), + PARSE_NO_PERM_PARAM( + ChatColor.RED + "Error! You do not have permission to use the parameter %s on the %s disguise!"), + PARSE_NO_PERM_REF(ChatColor.RED + "You do not have perimssion to use disguise references!"), + PARSE_NO_REF(ChatColor.RED + "Cannot find a disguise under the reference %s"), + PARSE_OPTION_NA(ChatColor.RED + "Cannot find the option %s"), + PARSE_SUPPLY_PLAYER(ChatColor.RED + "Error! You need to give a player name!"), + PARSE_TOO_MANY_ARGS(ChatColor.RED + "Error! %s doesn't know what to do with %s!"), + PARSE_USE_SECOND_NUM(ChatColor.RED + "Error! Only the disguises %s and %s uses a second number!"), + REF_TOO_MANY( + ChatColor.RED + "Failed to store the reference, too many cloned disguises. Please raise the maximum cloned disguises, or lower the time they last"), + RELOADED_CONFIG(ChatColor.GREEN + "[LibsDisguises] Reloaded config."), + UND_ENTITY(ChatColor.RED + "Right click a disguised entity to undisguise them!"), UNDISG(ChatColor.RED + "You are no longer disguised"), - VIEW_SELF_ON(ChatColor.GREEN + "Toggled viewing own disguise off!"), - BLOWN_DISGUISE(ChatColor.RED + "Your disguise was blown!"), - VIEW_SELF_OFF(ChatColor.GREEN + "Toggled viewing own disguise on!"), INVALID_CLONE( - ChatColor.DARK_RED + "Unknown option '%s' - Valid options are 'IgnoreEquipment' 'DoSneakSprint' 'DoSneak' 'DoSprint'"); + UNDISG_PLAYER(ChatColor.RED + "%s is no longer disguised"), + UNDISG_PLAYER_FAIL(ChatColor.RED + "%s not disguised!"), + UNDISG_PLAYER_HELP(ChatColor.RED + "/undisguiseplayer "), + UNDISRADIUS(ChatColor.RED + "Successfully undisguised %s entities!"), + UPDATE_READY( + ChatColor.RED + "[LibsDisguises] " + ChatColor.DARK_RED + "There is a update ready to be downloaded! You are using " + ChatColor.RED + "v%s" + ChatColor.DARK_RED + ", the new version is " + ChatColor.RED + "%s" + ChatColor.DARK_RED + "!"), + VIEW_SELF_OFF(ChatColor.GREEN + "Toggled viewing own disguise on!"), + VIEW_SELF_ON(ChatColor.GREEN + "Toggled viewing own disguise off!"); private String string; diff --git a/src/me/libraryaddict/disguise/utilities/TranslateFiller.java b/src/me/libraryaddict/disguise/utilities/TranslateFiller.java index cd5386be..6cad9a74 100644 --- a/src/me/libraryaddict/disguise/utilities/TranslateFiller.java +++ b/src/me/libraryaddict/disguise/utilities/TranslateFiller.java @@ -1,6 +1,8 @@ package me.libraryaddict.disguise.utilities; +import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.disguisetypes.DisguiseType; +import org.apache.commons.lang.StringUtils; import org.bukkit.inventory.ItemStack; import java.lang.reflect.Method; @@ -20,12 +22,18 @@ public class TranslateFiller { continue; for (String e : info.getEnums("")) { - TranslateType.METHOD_PARAM.get(e, "Used as a disguise option for " + info.getName()); + TranslateType.METHOD_PARAM.save(e, "Used as a disguise option for " + info.getName()); } } for (DisguiseType type : DisguiseType.values()) { - type.toReadable(); + String[] split = type.name().split("_"); + + for (int i = 0; i < split.length; i++) { + split[i] = split[i].substring(0, 1) + split[i].substring(1).toLowerCase(); + } + + TranslateType.DISGUISE.save(StringUtils.join(split, " "), "Name for the " + type.name() + " disguise"); for (Method method : ReflectionFlagWatchers.getDisguiseWatcherMethods(type.getWatcherClass())) { Class para = method.getParameterTypes()[0]; @@ -42,14 +50,20 @@ public class TranslateFiller { else if (className.equals("IllagerWizard")) className = "Illager"; - TranslateType.METHOD.get(method.getName(), + TranslateType.METHOD.save(method.getName(), "Found in the disguise options for " + className + " and uses " + (para.isArray() ? "multiple" + " " : "a ") + para.getSimpleName().replace("[]", "s")); } } for (LibsMsg msg : LibsMsg.values()) { - TranslateType.MESSAGE.get(msg.getRaw()); + TranslateType.MESSAGE.save(msg.getRaw()); + } + + if (!LibsPremium.isPremium() || !DisguiseConfig.isUseTranslations()) { + for (TranslateType type : TranslateType.values()) { + type.wipeTranslations(); + } } } } diff --git a/src/me/libraryaddict/disguise/utilities/TranslateType.java b/src/me/libraryaddict/disguise/utilities/TranslateType.java index 91b643d4..c4adbcbf 100644 --- a/src/me/libraryaddict/disguise/utilities/TranslateType.java +++ b/src/me/libraryaddict/disguise/utilities/TranslateType.java @@ -18,7 +18,10 @@ import java.util.Objects; * Created by libraryaddict on 10/06/2017. */ public enum TranslateType { - DISGUISE("disguises"), MESSAGE("messages"), METHOD_PARAM("disguise_options"), METHOD("disguise_option_parameters"); + DISGUISE("disguises"), + MESSAGE("messages"), + METHOD_PARAM("disguise_options"), + METHOD("disguise_option_parameters"); private File file; private HashMap translated = new HashMap<>(); @@ -34,16 +37,20 @@ public enum TranslateType { TranslateFiller.fillConfigs(); } - private void reload() { - if (!LibsPremium.isPremium() || !DisguiseConfig.isUseTranslations()) - return; - + public void wipeTranslations() { translated.clear(); + } + + private void reload() { + translated.clear(); + + if (LibsPremium.isPremium() && DisguiseConfig.isUseTranslations()) { + System.out.println("[LibsDisguises] Loading translations: " + name()); + } if (!file.exists()) return; - System.out.println("[LibsDisguises] Loading translations: " + name()); YamlConfiguration config = new YamlConfiguration(); config.options().pathSeparator(Character.toChars(0)[0]); @@ -68,7 +75,14 @@ public enum TranslateType { return file; } - private void save(String message, String comment) { + public void save(String msg) { + if (this != TranslateType.MESSAGE) + throw new IllegalArgumentException("Can't set no comment for '" + msg + "'"); + + save(msg, null); + } + + public void save(String message, String comment) { if (translated.containsKey(message)) return; @@ -86,9 +100,14 @@ public enum TranslateType { FileWriter writer = new FileWriter(getFile(), true); - if (!exists) + if (!exists) { writer.write("# To use translations in Lib's Disguises, you must have the purchased plugin\n"); + if (this == TranslateType.MESSAGE) { + writer.write("# %s is where text is inserted, look up printf format codes if you're interested\n"); + } + } + writer.write("\n" + (comment != null ? "# " + comment + "\n" : "") + "\"" + message + "\": \"" + message + "\"\n");