caskd
/
kami-blue
forked from RepoMirrors/kami-blue
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor redundant method

This commit is contained in:
EmotionalLove 2019-12-16 15:50:21 -08:00
parent 5880a9f326
commit ce6748454d
8 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/zeroeightsix/kami/command/Command.java
View File

@ -24,6 +24,7 @@ public abstract class Command {
protected SyntaxChunk[] syntaxChunks; protected SyntaxChunk[] syntaxChunks;
public static Setting<String> commandPrefix = Settings.s("commandPrefix", "."); public static Setting<String> commandPrefix = Settings.s("commandPrefix", ".");
public static final char SECTION_SIGN = '\u00A7';
public Command(String label, SyntaxChunk[] syntaxChunks) { public Command(String label, SyntaxChunk[] syntaxChunks) {
this.label = label; this.label = label;
@ -124,8 +125,4 @@ public abstract class Command {
} }
return null; return null;
} }
public static char SECTIONSIGN() {
return '\u00A7';
}
} }

2
src/main/java/me/zeroeightsix/kami/command/commands/LicenseCommand.java
View File

File diff suppressed because one or more lines are too long

48
src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java
View File

@ -224,33 +224,33 @@ public class KamiGUI extends GUI {
information.setText(""); information.setText("");
information.addLine("\u00A7b" + KamiMod.KAMI_KANJI + "\u00A73 " + KamiMod.MODVER); information.addLine("\u00A7b" + KamiMod.KAMI_KANJI + "\u00A73 " + KamiMod.MODVER);
if (privateInfoNam) { if (privateInfoNam) {
information.addLine("\u00A7bWelcome" + Command.SECTIONSIGN() + "3 " + privateDisplayN + "!"); information.addLine("\u00A7bWelcome" + Command.SECTION_SIGN + "3 " + privateDisplayN + "!");
} }
if (privateInfoTps) { if (privateInfoTps) {
information.addLine("\u00A7b" + Math.round(LagCompensator.INSTANCE.getTickRate()) + Command.SECTIONSIGN() + "3 tps"); information.addLine("\u00A7b" + Math.round(LagCompensator.INSTANCE.getTickRate()) + Command.SECTION_SIGN + "3 tps");
} }
if (privateInfoFps) { if (privateInfoFps) {
information.addLine("\u00A7b" + Minecraft.debugFPS + Command.SECTIONSIGN() + "3 fps"); information.addLine("\u00A7b" + Minecraft.debugFPS + Command.SECTION_SIGN + "3 fps");
} }
if (privateInfoPin) { if (privateInfoPin) {
information.addLine("\u00A7b" + privatePingValue + Command.SECTIONSIGN() + "3 ms"); information.addLine("\u00A7b" + privatePingValue + Command.SECTION_SIGN + "3 ms");
} }
if (privateInfoMem) { if (privateInfoMem) {
information.addLine("\u00A7b" + (Runtime.getRuntime().freeMemory() / 1000000) + Command.SECTIONSIGN() + "3mB free"); information.addLine("\u00A7b" + (Runtime.getRuntime().freeMemory() / 1000000) + Command.SECTION_SIGN + "3mB free");
} }
} else { } else {
information.setText(""); information.setText("");
information.addLine("\u00A7b" + KamiMod.KAMI_KANJI + "\u00A73 " + KamiMod.MODVER); information.addLine("\u00A7b" + KamiMod.KAMI_KANJI + "\u00A73 " + KamiMod.MODVER);
information.addLine(Command.SECTIONSIGN() + "EEnable InfoOverlay!"); information.addLine(Command.SECTION_SIGN + "EEnable InfoOverlay!");
} }
//information.addLine("\u00A7b" + Runtime.getRuntime().availableProcessors() + Command.SECTIONSIGN() + "3 cores"); //information.addLine("\u00A7b" + Runtime.getRuntime().availableProcessors() + Command.SECTION_SIGN + "3 cores");
//information.addLine("\u00A7b" + Wrapper.getPlayer().getDistance() + Command.SECTIONSIGN() + "3 fps"); //information.addLine("\u00A7b" + Wrapper.getPlayer().getDistance() + Command.SECTION_SIGN + "3 fps");
//OperatingSystemMXBean.getSystemLoadAverage() / OperatingSystemMXBean.getAvailableProcessors() //OperatingSystemMXBean.getSystemLoadAverage() / OperatingSystemMXBean.getAvailableProcessors()
// information.addLine("\u00A7b" + (Wrapper.getMinecraft().getVersion()) + Command.SECTIONSIGN() + "3% used"); // information.addLine("\u00A7b" + (Wrapper.getMinecraft().getVersion()) + Command.SECTION_SIGN + "3% used");
// information.addLine("\u00A7b" + (Runtime.getRuntime().totalMemory() / 1000000) + Command.SECTIONSIGN() + "3MB used"); // information.addLine("\u00A7b" + (Runtime.getRuntime().totalMemory() / 1000000) + Command.SECTION_SIGN + "3MB used");
// information.addLine("[&3" + Sprint.getSpeed() + "km/h&r]"); // information.addLine("[&3" + Sprint.getSpeed() + "km/h&r]");
@ -279,7 +279,7 @@ public class KamiGUI extends GUI {
String posString = (e.posY > mc.player.posY ? ChatFormatting.DARK_GREEN + "+" : (e.posY == mc.player.posY ? " " : ChatFormatting.DARK_RED + "-")); String posString = (e.posY > mc.player.posY ? ChatFormatting.DARK_GREEN + "+" : (e.posY == mc.player.posY ? " " : ChatFormatting.DARK_RED + "-"));
float hpRaw = ((EntityLivingBase) e).getHealth() + ((EntityLivingBase) e).getAbsorptionAmount(); float hpRaw = ((EntityLivingBase) e).getHealth() + ((EntityLivingBase) e).getAbsorptionAmount();
String hp = dfHealth.format(hpRaw); String hp = dfHealth.format(hpRaw);
healthSB.append(Command.SECTIONSIGN()); healthSB.append(Command.SECTION_SIGN);
if (hpRaw >= 20) { if (hpRaw >= 20) {
healthSB.append("a"); healthSB.append("a");
} else if (hpRaw >= 10) { } else if (hpRaw >= 10) {
@ -302,7 +302,7 @@ public class KamiGUI extends GUI {
players = sortByValue(players); players = sortByValue(players);
for (Map.Entry<String, Integer> player : players.entrySet()) { for (Map.Entry<String, Integer> player : players.entrySet()) {
list.addLine(Command.SECTIONSIGN() + "7" + player.getKey() + " " + Command.SECTIONSIGN() + "8" + player.getValue()); list.addLine(Command.SECTION_SIGN + "7" + player.getKey() + " " + Command.SECTION_SIGN + "8" + player.getValue());
} }
}); });
frame.setCloseable(false); frame.setCloseable(false);
@ -374,24 +374,24 @@ public class KamiGUI extends GUI {
int hposZ = (int) (mc.player.posZ * f); int hposZ = (int) (mc.player.posZ * f);
coordsLabel.setText(String.format(" %sf%,d%s7, %sf%,d%s7, %sf%,d %s7(%sf%,d%s7, %sf%,d%s7, %sf%,d%s7)", coordsLabel.setText(String.format(" %sf%,d%s7, %sf%,d%s7, %sf%,d %s7(%sf%,d%s7, %sf%,d%s7, %sf%,d%s7)",
Command.SECTIONSIGN(), Command.SECTION_SIGN,
posX, posX,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
posY, posY,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
posZ, posZ,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
hposX, hposX,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
posY, posY,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
Command.SECTIONSIGN(), Command.SECTION_SIGN,
hposZ, hposZ,
Command.SECTIONSIGN() Command.SECTION_SIGN
)); ));
} }
}); });

2
src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiActiveModulesUI.java
View File

@ -62,7 +62,7 @@ public class KamiActiveModulesUI extends AbstractComponentUI<ActiveModules> {
if (module.getShowOnArray().equals(Module.ShowOnArray.ON)) { if (module.getShowOnArray().equals(Module.ShowOnArray.ON)) {
int rgb = Color.HSBtoRGB(hue[0], 1, 1); int rgb = Color.HSBtoRGB(hue[0], 1, 1);
String s = module.getHudInfo(); String s = module.getHudInfo();
String text = module.getName() + (s == null ? "" : " " + Command.SECTIONSIGN() + "7" + s); String text = module.getName() + (s == null ? "" : " " + Command.SECTION_SIGN + "7" + s);
int textwidth = renderer.getStringWidth(text); int textwidth = renderer.getStringWidth(text);
int textheight = renderer.getFontHeight() + 1; int textheight = renderer.getFontHeight() + 1;
int red = (rgb >> 16) & 0xFF; int red = (rgb >> 16) & 0xFF;

2
src/main/java/me/zeroeightsix/kami/module/modules/zeroeightysix/misc/ChatEncryption.java
View File

@ -88,7 +88,7 @@ public class ChatEncryption extends Module {
break; break;
} }
((SPacketChat) event.getPacket()).chatComponent = new TextComponentString(Command.SECTIONSIGN() + "b" + username + Command.SECTIONSIGN() + "r: " + builder.toString()); ((SPacketChat) event.getPacket()).chatComponent = new TextComponentString(Command.SECTION_SIGN + "b" + username + Command.SECTION_SIGN + "r: " + builder.toString());
} }
}); });

6
src/main/java/me/zeroeightsix/kami/module/modules/zeroeightysix/misc/ColourSign.java
View File

@ -30,7 +30,7 @@ public class ColourSign extends Module {
// if (event.getPacket() instanceof CPacketUpdateSign) { // if (event.getPacket() instanceof CPacketUpdateSign) {
// String[] lines = ((CPacketUpdateSign) event.getPacket()).lines; // String[] lines = ((CPacketUpdateSign) event.getPacket()).lines;
// for (int i = 0; i < 4; i++) { // for (int i = 0; i < 4; i++) {
// lines[i] = lines[i].replace(Command.SECTIONSIGN() + "", Command.SECTIONSIGN() + Command.SECTIONSIGN() + "rr"); // lines[i] = lines[i].replace(Command.SECTION_SIGN + "", Command.SECTION_SIGN + Command.SECTION_SIGN + "rr");
// } // }
// } // }
// }); // });
@ -50,7 +50,7 @@ public class ColourSign extends Module {
@Override @Override
protected void actionPerformed(GuiButton button) throws IOException { protected void actionPerformed(GuiButton button) throws IOException {
if (button.id == 0) { if (button.id == 0) {
this.tileSign.signText[this.editLine] = new TextComponentString(tileSign.signText[this.editLine].getFormattedText().replaceAll("(" + Command.SECTIONSIGN() + ")(.)", "$1$1$2$2")); this.tileSign.signText[this.editLine] = new TextComponentString(tileSign.signText[this.editLine].getFormattedText().replaceAll("(" + Command.SECTION_SIGN + ")(.)", "$1$1$2$2"));
} }
super.actionPerformed(button); super.actionPerformed(button);
} }
@ -59,7 +59,7 @@ public class ColourSign extends Module {
protected void keyTyped(char typedChar, int keyCode) throws IOException { protected void keyTyped(char typedChar, int keyCode) throws IOException {
super.keyTyped(typedChar, keyCode); super.keyTyped(typedChar, keyCode);
String s = ((TextComponentString) tileSign.signText[this.editLine]).getText(); String s = ((TextComponentString) tileSign.signText[this.editLine]).getText();
s = s.replace("&", Command.SECTIONSIGN() + ""); s = s.replace("&", Command.SECTION_SIGN + "");
tileSign.signText[this.editLine] = new TextComponentString(s); tileSign.signText[this.editLine] = new TextComponentString(s);
} }

2
src/main/java/me/zeroeightsix/kami/module/modules/zeroeightysix/render/ExtraTab.java
View File

@ -24,7 +24,7 @@ public class ExtraTab extends Module {
public static String getPlayerName(NetworkPlayerInfo networkPlayerInfoIn) { public static String getPlayerName(NetworkPlayerInfo networkPlayerInfoIn) {
String dname = networkPlayerInfoIn.getDisplayName() != null ? networkPlayerInfoIn.getDisplayName().getFormattedText() : ScorePlayerTeam.formatPlayerName(networkPlayerInfoIn.getPlayerTeam(), networkPlayerInfoIn.getGameProfile().getName()); String dname = networkPlayerInfoIn.getDisplayName() != null ? networkPlayerInfoIn.getDisplayName().getFormattedText() : ScorePlayerTeam.formatPlayerName(networkPlayerInfoIn.getPlayerTeam(), networkPlayerInfoIn.getGameProfile().getName());
if (Friends.isFriend(dname)) return String.format("%sa%s", Command.SECTIONSIGN(), dname); if (Friends.isFriend(dname)) return String.format("%sa%s", Command.SECTION_SIGN, dname);
return dname; return dname;
} }
} }

2
src/main/java/me/zeroeightsix/kami/module/modules/zeroeightysix/render/Nametags.java
View File

@ -91,7 +91,7 @@ public class Nametags extends Module {
FontRenderer fontRendererIn = mc.fontRenderer; FontRenderer fontRendererIn = mc.fontRenderer;
GlStateManager.scale(-0.025F, -0.025F, 0.025F); GlStateManager.scale(-0.025F, -0.025F, 0.025F);
String str = entityIn.getName() + (health.getValue() ? " " + Command.SECTIONSIGN() + "a" + Math.round(((EntityLivingBase) entityIn).getHealth() + (entityIn instanceof EntityPlayer ? ((EntityPlayer) entityIn).getAbsorptionAmount() : 0)) : ""); String str = entityIn.getName() + (health.getValue() ? " " + Command.SECTION_SIGN + "a" + Math.round(((EntityLivingBase) entityIn).getHealth() + (entityIn instanceof EntityPlayer ? ((EntityPlayer) entityIn).getAbsorptionAmount() : 0)) : "");
int i = fontRendererIn.getStringWidth(str) / 2; int i = fontRendererIn.getStringWidth(str) / 2;
GlStateManager.enableBlend(); GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);