RepoMirrors
/
kami-blue
mirror of https://github.com/kami-blue/client
1
0
Fork 1
Code Issues Releases Wiki Activity

Switch to using Kotlin instances of MacroManager and Macro

This commit is contained in:
Bella 2020-05-05 11:14:48 -04:00
parent fa15a2e535
commit ece0e86d7b
No known key found for this signature in database
GPG Key ID: DBD4A6030080C8B3
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/zeroeightsix/kami/KamiMod.java
View File

@ -147,7 +147,7 @@ public class KamiMod {
Friends.initFriends();
MacroManager.register();
MacroManager.INSTANCE.registerMacros();
/* Custom static Settings, which can't register normally if they're static */
SettingsRegister.register("commandPrefix", Command.commandPrefix);

4
src/main/java/me/zeroeightsix/kami/command/commands/ConfigCommand.java
View File

@ -39,13 +39,13 @@ public class ConfigCommand extends Command {
switch (args[0].toLowerCase()) {
case "reload":
Macro.readFileToMemory();
Macro.INSTANCE.readFileToMemory();
reload();
break;
case "save":
try {
KamiMod.saveConfigurationUnsafe();
MacroManager.saveMacros();
MacroManager.INSTANCE.saveMacros();
sendChatMessage("Saved configuration and macros!");
} catch (IOException e) {
e.printStackTrace();

14
src/main/java/me/zeroeightsix/kami/command/commands/MacroCommand.kt
View File

@ -2,8 +2,8 @@ package me.zeroeightsix.kami.command.commands
import me.zeroeightsix.kami.command.Command
import me.zeroeightsix.kami.command.syntax.ChunkBuilder
import me.zeroeightsix.kami.module.MacroManager
import me.zeroeightsix.kami.util.Macro.*
import me.zeroeightsix.kami.module.Macros
import me.zeroeightsix.kami.util.Macro
import me.zeroeightsix.kami.util.MessageSendHelper.*
import me.zeroeightsix.kami.util.Wrapper
@ -28,23 +28,23 @@ class MacroCommand : Command("macro", ChunkBuilder().append("key|list").append("
}
args[0] == "list" -> {
sendChatMessage("You have the following macros: ")
for ((key1, value) in MacroManager.macros) {
for ((key1, value) in Macros.macros) {
sendChatMessage(Wrapper.getKeyName(key1.toInt()) + ": $value")
}
return
}
args[1] == null -> { /* message */
if (getMacrosForKey(key) == null) {
if (Macro.getMacrosForKey(key) == null) {
sendChatMessage("'&7$rKey&f' has no macros")
return
}
// TODO: empty check doesn't work idk
sendChatMessage("'&7$rKey&f' has the following macros: ")
sendStringChatMessage(getMacrosForKey(key).toTypedArray(), false)
sendStringChatMessage(Macro.getMacrosForKey(key)?.toTypedArray(), false)
return
}
args[1] == "clear" -> {
removeMacro(key.toString())
Macro.removeMacro(key.toString())
sendChatMessage("Cleared macros for '&7$rKey&f'")
return
}
@ -53,7 +53,7 @@ class MacroCommand : Command("macro", ChunkBuilder().append("key|list").append("
return
}
else -> {
addMacroToKey(key.toString(), macro)
Macro.addMacroToKey(key.toString(), macro)
sendChatMessage("Added macro '&7$macro&f' for key '&7$rKey&f'")
}
}

2
src/main/java/me/zeroeightsix/kami/event/ForgeEventProcessor.java
View File

@ -236,7 +236,7 @@ public class ForgeEventProcessor {
Minecraft.getMinecraft().displayGuiScreen(new GuiChat(Command.getCommandPrefix()));
} else {
MODULE_MANAGER.onBind(Keyboard.getEventKey());
MacroManager.sendMacro(Keyboard.getEventKey());
MacroManager.INSTANCE.sendMacro(Keyboard.getEventKey());
}
}

2
src/main/java/me/zeroeightsix/kami/mixin/client/MixinMinecraft.java
View File

@ -111,7 +111,7 @@ public class MixinMinecraft {
private void save() {
System.out.println("Shutting down: saving KAMI configuration");
KamiMod.saveConfiguration();
MacroManager.saveMacros();
MacroManager.INSTANCE.saveMacros();
System.out.println("Configuration saved.");
}