diff --git a/src/main/java/me/zeroeightsix/kami/KamiMod.java b/src/main/java/me/zeroeightsix/kami/KamiMod.java index 3df92ea66..abe4eeb63 100644 --- a/src/main/java/me/zeroeightsix/kami/KamiMod.java +++ b/src/main/java/me/zeroeightsix/kami/KamiMod.java @@ -71,9 +71,11 @@ public class KamiMod { static final String UPDATE_JSON = "https://raw.githubusercontent.com/S-B99/kamiblue/assets/assets/updateChecker.json"; public static final String DONATORS_JSON = "https://raw.githubusercontent.com/S-B99/kamiblue/assets/assets/donators.json"; public static final String CAPES_JSON = "https://raw.githubusercontent.com/S-B99/kamiblue/assets/assets/capes.json"; - public static final String WEBSITE_LINK = "https://github.com/S-B99/KAMI"; + public static final String GITHUB_LINK = "https://github.com/S-B99/KAMI"; + public static final String WEBSITE_LINK = "https://blue.bella.wtf"; -// public static final String KAMI_HIRAGANA = "\u304B\u307F"; + + // public static final String KAMI_HIRAGANA = "\u304B\u307F"; // public static final String KAMI_KATAKANA = "\u30AB\u30DF"; public static final String KAMI_KANJI = "\u30ab\u30df\u30d6\u30eb"; public static final String KAMI_BLUE = "\u1d0b\u1d00\u1d0d\u026a \u0299\u029f\u1d1c\u1d07"; diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/AutoReplyCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/AutoReplyCommand.java index 363dcd304..57487ce4b 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/AutoReplyCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/AutoReplyCommand.java @@ -12,7 +12,7 @@ import me.zeroeightsix.kami.module.modules.chat.AutoReply; public class AutoReplyCommand extends Command { public AutoReplyCommand() { super("autoreply", new ChunkBuilder().append("message").append("=listener").append("-replyCommand").build()); - setDescription("Allows you to customize AutoReply's message setting"); + setDescription("Allows you to customize AutoReply's settings"); } @Override diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/CommandsCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/CommandsCommand.java index 6ab193933..83bf62960 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/CommandsCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/CommandsCommand.java @@ -19,7 +19,7 @@ public class CommandsCommand extends Command { @Override public void call(String[] args) { KamiMod.getInstance().getCommandManager().getCommands().stream().sorted(Comparator.comparing(command -> command.getLabel())).forEach(command -> - Command.sendChatMessage("&7" + Command.getCommandPrefix() + command.getLabel() + "&r ~ &8" + command.getDescription()) + Command.sendChatMessage("&f" + Command.getCommandPrefix() + command.getLabel() + "&r ~ &7" + command.getDescription()) ); } } diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/EnabledCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/EnabledCommand.java index ea83d0b67..cd4a8d8f6 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/EnabledCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/EnabledCommand.java @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicReference; public class EnabledCommand extends Command { public EnabledCommand() { super("enabled", null); - setDescription("Prints Enabled Modules"); + setDescription("Prints enabled modules"); } @Override diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/HelpCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/HelpCommand.java index 73174c843..15d77c3f2 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/HelpCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/HelpCommand.java @@ -7,6 +7,8 @@ import me.zeroeightsix.kami.module.ModuleManager; import java.util.Arrays; +import static me.zeroeightsix.kami.KamiMod.WEBSITE_LINK; + /** * Created by 086 on 11/11/2017. */ @@ -40,16 +42,17 @@ public class HelpCommand extends Command { @Override public void call(String[] args) { + String commandPrefix = Command.getCommandPrefix(); if (args[0] == null) { Command.sendStringChatMessage(new String[]{ "KAMI Blue " + KamiMod.MODVER, "&7Press &r" + ModuleManager.getModuleByName("ClickGUI").getBindName() + "&7 to open GUI", - "&7see &bhttps://blue.bella.wtf&7 for a full version of the faq", - "description&7 to see the description of a module", - "commands&7 to view all available commands", - "bind &7 to bind mods", - "prefix &r to change the command prefix.", - "help &7&r for more help." + "&7see &b" + WEBSITE_LINK + "&7 for a full version of the faq", + commandPrefix + "description&7 to see the description of a module", + commandPrefix + "commands&7 to view all available commands", + commandPrefix + "bind &7 to bind mods", + commandPrefix + "prefix &r to change the command prefix.", + commandPrefix + "help &7&r for more help." }); } else { String subject = args[0]; diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/SignBookCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/SignBookCommand.java index 0b51c1c39..3d89855cd 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/SignBookCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/SignBookCommand.java @@ -21,7 +21,7 @@ public class SignBookCommand extends Command { public SignBookCommand() { super("signbook", new ChunkBuilder().append("name").build()); - setDescription("Colored book names. &7#n&8 for a new line and &7&&8 for colour codes"); + setDescription("Colored book names. &f#n&7 for a new line and &f&&7 for colour codes"); } @Override diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/XRayCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/XRayCommand.java index 7a4d6da3a..99894b442 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/XRayCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/XRayCommand.java @@ -14,7 +14,7 @@ import net.minecraft.block.Block; public class XRayCommand extends Command { public XRayCommand() { super("xray", new ChunkBuilder().append("help").append("+block|-block|=block").append("list|defaults|clear|invert").build()); - setDescription("Allows you to add or remove blocks from the &7xray &8module"); + setDescription("Allows you to add or remove blocks from the &fxray &7module"); } @Override diff --git a/src/main/java/me/zeroeightsix/kami/module/Module.java b/src/main/java/me/zeroeightsix/kami/module/Module.java index 096dc2cec..72a9a6c55 100644 --- a/src/main/java/me/zeroeightsix/kami/module/Module.java +++ b/src/main/java/me/zeroeightsix/kami/module/Module.java @@ -17,7 +17,7 @@ import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.List; -import static me.zeroeightsix.kami.KamiMod.WEBSITE_LINK; +import static me.zeroeightsix.kami.KamiMod.GITHUB_LINK; /** * Created by 086 on 23/08/2017. @@ -115,7 +115,7 @@ public class Module { @Retention(RetentionPolicy.RUNTIME) public @interface Info { String name(); - String description() default "No description for this module, please report this so it can be fixed at &b" + WEBSITE_LINK; + String description() default "No description for this module, please report this so it can be fixed at &b" + GITHUB_LINK; Module.Category category(); boolean alwaysListening() default false; ShowOnArray showOnArray() default ShowOnArray.ON;