Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General grammar and usability changes! #1

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
6 changes: 3 additions & 3 deletions src/main/java/ovh/adiantek/hatari/GuiHatariGame.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@ public void prepareRender() {
};
gw.setPinned(true);
addWindow(gw);
GuiText gt = new GuiText(0, 0, "Welcome in Hatari 1.7.10 by barwnikk!",
GuiText gt = new GuiText(0, 0, "Welcome to Hatari v1.1 by barwnikk!",
0xffffffff, false);
gt.x = (250 - Minecraft.getMinecraft().fontRenderer
.getStringWidth(gt.text)) / 2;
gw.addText(gt);
GuiText gt2 = new GuiText(0, 14, "Press U to open console.",
GuiText gt2 = new GuiText(0, 14, "Press U to open the console.",
0xffffffff, false);
gt2.x = (250 - Minecraft.getMinecraft().fontRenderer
.getStringWidth(gt2.text)) / 2;
gw.addText(gt2);
GuiText gt3 = new GuiText(0, 14 + 12, "Press Y to manage windows.",
GuiText gt3 = new GuiText(0, 14 + 12, "Press Y to open the GUI",
0xffffffff, false);
gt3.x = (250 - Minecraft.getMinecraft().fontRenderer
.getStringWidth(gt3.text)) / 2;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/AntiInvisible.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class AntiInvisible extends Modification {
public AntiInvisible() {
super(AntiInvisible.class, Categories.RENDER, "AntiInvisible");
MinecraftForge.EVENT_BUS.register(this);
addToggleCommand("antiinvisible", "Show entities with invisible effect");
addToggleCommand("antiinvisible", "Shows invisible entities");
}
private boolean invisible;
@Executor
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/AutoArmor.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class AutoArmor extends Modification implements ItemListener {
public AutoArmor() {
super(AutoArmor.class, Categories.COMBAT, "Auto-Armor");
FMLCommonHandler.instance().bus().register(this);
this.addToggleCommand("autoarmor", "Wear automatically armor if you don't wear");
this.addToggleCommand("autoarmor", "Automatically equips the best armor in your inventory.);
}
@Override
public JComponent openConfig() {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/ovh/adiantek/hatari/mods/AutoFish.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ public AutoFish() {
super(AutoFish.class, Categories.PLAYER, "Auto-Fish");
MinecraftForge.EVENT_BUS.register(this);
addToggleCommand("autofish", "Enable or disable Auto-Fish");
addToggleCommand("autofish multirod", "Use multirod");
addToggleCommand("autofish recast", "Enable or disable recast fishing rod");
addToggleCommand("autofish multirod", "Enable or disable multirod");
addToggleCommand("autofish recast", "Enable or disable auto recast");
instance = this;
}

Expand Down Expand Up @@ -184,9 +184,9 @@ public void exec(String command) {
if (command.equals("autofish recast")) {
recast = setBoolean("recast", !recast);
if (recast) {
viewMessage("Enabled recasting rod.");
viewMessage("Enabled recasting.");
} else {
viewMessage("Disabled recasting rod.");
viewMessage("Disabled recasting.");
}
}
if (command.equals("autofish multirod")) {
Expand All @@ -198,4 +198,4 @@ public void exec(String command) {
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/ovh/adiantek/hatari/mods/AutoLogin.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ public class AutoLogin extends Modification {

public AutoLogin() {
super(AutoLogin.class, Categories.MISC, "Auto-Login");
addToggleCommand("autologin", "Automatically login on server");
addToggleCommand("autologin", "Automatically login on cracked servers);
addToggleCommand("autologin generate",
"Generate random password and copy to clipboard");
CommandManager
.createNewCommand()
.setCommand("autologin generate")
.setDescription(
"Generate random password and copy it to clipboard")
"Generate a random password and copy it to clipboard")
.setExecutor(this)
.setRequestArguments(
new CommandManager.CommandValidator[] { new CommandManager.IntegerValidator() },
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ovh/adiantek/hatari/mods/AutoSign.java
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private GuiButton createButton() {
public AutoSign() {
super(AutoSign.class, Categories.WORLD, "Auto-Sgin");
MinecraftForge.EVENT_BUS.register(this);
this.addToggleCommand("autosign", "Create fast sign");
this.addToggleCommand("autosign", "Fills in a sign for you");
}

@Override
Expand Down Expand Up @@ -161,7 +161,7 @@ public void event(String command){
public void event(GuiScreenEvent.ActionPerformedEvent.Post bt) {
if (bt.button.id == buttonId) {
lines = setObject("lines", gui.tileSign.signText.clone());
viewMessage("Auto-Sign setted!");
viewMessage("Sign content set");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/AutoSwitch.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class AutoSwitch extends Modification {
public AutoSwitch() {
super(AutoSwitch.class, Categories.PLAYER, "Auto-Switch");
FMLCommonHandler.instance().bus().register(this);
addToggleCommand("autoswitch", "Constantly switch selected hotbar slot");
addToggleCommand("autoswitch", "Cycles your hotbar slots");
}
@Executor
public void exec(String cmd) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/AutoTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class AutoTool extends Modification {
public AutoTool() {
super(AutoTool.class, Categories.PLAYER, "Auto-Tool");
MinecraftForge.EVENT_BUS.register(this);
addToggleCommand("autotool", "Select best tool to break block");
addToggleCommand("autotool", "Automatically selects the best tool for the job");
}
protected boolean onEnable() {
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/AutoWalk.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class AutoWalk extends Modification {
public AutoWalk() {
super(AutoWalk.class, Categories.MOVEMENT, "Auto-Walk");
FMLCommonHandler.instance().bus().register(this);
addToggleCommand("autowalk", "Go forward without pressing keys");
addToggleCommand("autowalk", "Walks for you");
}
@Override
protected boolean onEnable() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/Fly.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class Fly extends Modification {
public Fly() {
super(Fly.class, Categories.MOVEMENT, "Fly");
addToggleCommand("fly", "Enable or disable fly");
addToggleCommand("fly force", "Enable or disable force fly (bypass disable fly by server)");
addToggleCommand("fly force", "Force flying on servers (can prevent being kicked for flying)");
CommandManager
.createNewCommand()
.setCommand("fly set")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/Fullbright.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class Fullbright extends Modification {
public Fullbright() {
super(Fullbright.class, Categories.RENDER, "Fullbright");
FMLCommonHandler.instance().bus().register(this);
addToggleCommand("fullbright", "Allow for clear as day nights, fully lit caves.");
addToggleCommand("fullbright", "Cranks the gamma to make it easier to see");
}
public boolean onEnable() {
old=mc.gameSettings.gammaSetting;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/HighJump.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class HighJump extends Modification {
@Executor
public void exec(String command, double value) {
height=setDouble("height", value);
viewMessage("Setted height of jump to "+value);
viewMessage("Set height of jump to "+value);
}
@Executor
public void exec(String command) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ovh/adiantek/hatari/mods/InvSee.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public InvSee() {
.setCommand("Invsee")
.setExecutor(this)
.setDescription(
"View EQ, potion effects about player near you.")
"See armor and potion effects of other players")
.setRequestArguments(
new CommandManager.CommandValidator[] { new CommandManager.EntityPlayerValidator() },
new String[] { "player" }, false).register();
Expand All @@ -44,7 +44,7 @@ public InvSee() {
.setCommand("invsee")
.setExecutor(this)
.setDescription(
"View EQ, potion effects about player near you.")
"See armor and potion effects of other players")
.setRequestArguments(
new CommandManager.CommandValidator[] {},
new String[] {}, false).register();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/ovh/adiantek/hatari/mods/KillAura.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class KillAura extends Modification {

public KillAura() {
super(KillAura.class, Categories.COMBAT, "KillAura");
addToggleCommand("killaura", "Automatycally kills mobs or players");
addToggleCommand("killaura", "Automatically attacks entities in a set range");
addToggleCommand("killaura autoattack",
"Enable or disable attacking entities.");
addToggleCommand("killaura autoattack onlyvisible",
Expand Down Expand Up @@ -70,9 +70,9 @@ else if (cmd.equals("killaura autoattack")) {
} else if (cmd.equals("killaura autoattack onlyvisible")) {
vis = setBoolean("vis", !vis);
if (vis) {
viewMessage("Enabled attacking visible entities (you will not attack invisible)!");
viewMessage("Enabled visible only");
} else {
viewMessage("Disabled attacking only visible entities (you will attack all entities)!");
viewMessage("Disabled visible only");
}

}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ovh/adiantek/hatari/mods/NoHurtShakes.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public NoHurtShakes() {
super(NoHurtShakes.class, Categories.RENDER, "NoHurtShakes");
FMLCommonHandler.instance().bus().register(this);
addToggleCommand("nohurtshakes",
"Disable visual appearance of red tint after attack");
"Removes the hurtcam effect");
}

public boolean onEnable() {
Expand All @@ -33,4 +33,4 @@ public void event(TickEvent.ClientTickEvent e) {
return;
mc.thePlayer.hurtTime = 0;
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/Say.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public Say() {
CommandManager
.createNewCommand()
.setCommand("say")
.setDescription("Say message to server")
.setDescription("Use this to say something without tripping the command interpreter.")
.setExecutor(this)
.setRequestArguments(
new CommandManager.CommandValidator[] { new CommandManager.StringValidator() },
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ovh/adiantek/hatari/mods/SelfKick.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class SelfKick extends Modification {
//private Packet bugPacket = new C03PacketPlayer.C04PacketPlayerPosition(Double.NaN, Double.NaN, Double.NaN, Double.NaN, true);
public SelfKick() {
super(SelfKick.class, Categories.PLAYER, "SelfKick");
addToggleCommand("selfkick", "Disconnect from server while PvP");
addToggleCommand("selfkick", "Disconnect from server while combat logged");
}
@Executor
public void event(String cmd) {
Expand All @@ -27,4 +27,4 @@ protected boolean onEnable() {
mc.getNetHandler().addToSendQueue(bugPacket);
return false;
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/ovh/adiantek/hatari/mods/Sprint.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class Sprint extends Modification {
public Sprint() {
super(Sprint.class, Categories.MOVEMENT, "Sprint");
FMLCommonHandler.instance().bus().register(this);
addToggleCommand("sprint", "Toggle sprint when walking");
addToggleCommand("sprint", "Sprints automatically");
}
@Executor
public void event(String cmd) {
Expand Down