Merge pull request #1 from kotyk7/master

Fixed spacing and grammar
LukeOnuke · Jul 24, 2020 · 3d4b186 · 3d4b186
2 parents 0326738 + 97a06d5
commit 3d4b186
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 41 deletions.
diff --git a/AdminTools/build/classes/rconclient/gui/LoginWindow.fxml b/AdminTools/build/classes/rconclient/gui/LoginWindow.fxml
@@ -31,11 +31,11 @@
          <children>
             <AnchorPane fx:id="loginPane" maxHeight="-Infinity" maxWidth="-Infinity" opacity="0.9" prefHeight="290.0" prefWidth="441.0" styleClass="loginCenter" StackPane.alignment="CENTER">
                <children>
-                  <Label layoutX="15.0" layoutY="87.0" styleClass="text" text="IP  : " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="87.0" />
+                  <Label layoutX="15.0" layoutY="87.0" styleClass="text" text="IP: " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="87.0" />
                   <TextField fx:id="ip" layoutX="87.0" layoutY="83.0" prefHeight="29.0" prefWidth="245.0" styleClass="rconTextField" AnchorPane.leftAnchor="87.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="83.0" />
-                  <Label layoutX="15.0" layoutY="137.0" styleClass="text" text="Port : " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="137.0" />
+                  <Label layoutX="15.0" layoutY="137.0" styleClass="text" text="Port: " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="137.0" />
                   <TextField fx:id="port" layoutX="87.0" layoutY="133.0" prefHeight="29.0" prefWidth="245.0" styleClass="rconTextField" AnchorPane.leftAnchor="87.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="133.0" />
-                  <Label layoutX="15.0" layoutY="187.0" styleClass="text" text="Password : " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="187.0" />
+                  <Label layoutX="15.0" layoutY="187.0" styleClass="text" text="Password: " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="187.0" />
                   <PasswordField fx:id="password" layoutX="87.0" layoutY="183.0" prefHeight="29.0" prefWidth="245.0" styleClass="rconTextField" AnchorPane.leftAnchor="87.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="183.0" />
                   <Label fx:id="loginButton" layoutX="299.0" layoutY="488.0" onMouseClicked="#login" styleClass="labelButton" text="Log in" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0" />
                   <Text layoutX="104.0" layoutY="56.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Admin Tools">

diff --git a/AdminTools/build/classes/rconclient/gui/StatusWindow.fxml b/AdminTools/build/classes/rconclient/gui/StatusWindow.fxml
@@ -48,8 +48,8 @@
                <children>
                   <Text layoutY="14.0" strokeType="OUTSIDE" strokeWidth="0.0" styleClass="borderPaneText" text="Server status" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
                   <ImageView fx:id="sFavicon" fitHeight="64.0" fitWidth="64.0" layoutX="14.0" layoutY="18.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="24.0" />
-                  <Label fx:id="sVer" layoutX="18.0" layoutY="96.0" styleClass="text" text="Version : " AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="100.0" />
-                  <Label fx:id="sPlayers" layoutX="18.0" layoutY="127.0" styleClass="text" text="Players online : " AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="140.0" />
+                  <Label fx:id="sVer" layoutX="18.0" layoutY="96.0" styleClass="text" text="Version: " AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="100.0" />
+                  <Label fx:id="sPlayers" layoutX="18.0" layoutY="127.0" styleClass="text" text="Players online: " AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="140.0" />
                   <Label layoutX="373.0" layoutY="461.0" onMouseClicked="#mcStatusRefresh" styleClass="labelButton" text="Refresh" AnchorPane.bottomAnchor="12.0" AnchorPane.rightAnchor="14.0" />
                   <ListView fx:id="sOnlinePlayers" layoutX="14.0" layoutY="168.0" onMouseClicked="#handleMouseClick" prefHeight="274.0" prefWidth="384.0" AnchorPane.bottomAnchor="46.0" AnchorPane.leftAnchor="13.0" AnchorPane.rightAnchor="22.0" AnchorPane.topAnchor="167.0" />
                </children>

diff --git a/AdminTools/src/rconclient/gui/LoginWindow.fxml b/AdminTools/src/rconclient/gui/LoginWindow.fxml
@@ -31,11 +31,11 @@
          <children>
             <AnchorPane fx:id="loginPane" maxHeight="-Infinity" maxWidth="-Infinity" opacity="0.9" prefHeight="290.0" prefWidth="441.0" styleClass="loginCenter" StackPane.alignment="CENTER">
                <children>
-                  <Label layoutX="15.0" layoutY="87.0" styleClass="text" text="IP  : " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="87.0" />
+                  <Label layoutX="15.0" layoutY="87.0" styleClass="text" text="IP:" AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="87.0" />
                   <TextField fx:id="ip" layoutX="87.0" layoutY="83.0" prefHeight="29.0" prefWidth="245.0" styleClass="rconTextField" AnchorPane.leftAnchor="87.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="83.0" />
-                  <Label layoutX="15.0" layoutY="137.0" styleClass="text" text="Port : " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="137.0" />
+                  <Label layoutX="15.0" layoutY="137.0" styleClass="text" text="Port:" AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="137.0" />
                   <TextField fx:id="port" layoutX="87.0" layoutY="133.0" prefHeight="29.0" prefWidth="245.0" styleClass="rconTextField" AnchorPane.leftAnchor="87.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="133.0" />
-                  <Label layoutX="15.0" layoutY="187.0" styleClass="text" text="Password : " AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="187.0" />
+                  <Label layoutX="15.0" layoutY="187.0" styleClass="text" text="Password:" AnchorPane.leftAnchor="15.0" AnchorPane.topAnchor="187.0" />
                   <PasswordField fx:id="password" layoutX="87.0" layoutY="183.0" prefHeight="29.0" prefWidth="245.0" styleClass="rconTextField" AnchorPane.leftAnchor="87.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="183.0" />
                   <Label fx:id="loginButton" layoutX="299.0" layoutY="488.0" onMouseClicked="#login" styleClass="labelButton" text="Log in" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0" />
                   <Text layoutX="104.0" layoutY="56.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Admin Tools">

diff --git a/AdminTools/src/rconclient/gui/RconWindowController.java b/AdminTools/src/rconclient/gui/RconWindowController.java
@@ -164,19 +164,19 @@ public void initialize(URL url, ResourceBundle rb) {
                 sidePane.setDisable(true);
 
                 Data d = Data.getInstance();
-                writeRconInternal("Connecting to " + d.getHost() + " : " + d.getPort());
+                writeRconInternal("Connecting to " + d.getHost() + ":" + d.getPort());
                 try {
                     CustomRcon cr = CustomRcon.getInstance();
                 } catch (IOException ex) {
                     connected = false;
                     Platform.runLater(() -> {
-                        Dialog.okDialog(DialogImage.error, "Connnection Error", "Couldnt connect to server.\n Probably an incorect IP.");
+                        Dialog.okDialog(DialogImage.error, "Connnection Error", "Couldn't connect to server.\n Probably an incorect IP.");
                         WindowLoader.loadLogin(rootPane);
                     });
                 } catch (AuthenticationException ex) {
                     connected = false;
                     Platform.runLater(() -> {
-                        Dialog.okDialog(DialogImage.error, "Connnection Error", "Couldnt authenticate with server. \nIncorrect password.");
+                        Dialog.okDialog(DialogImage.error, "Connnection Error", "Couldn't authenticate with server. \nIncorrect password.");
                         WindowLoader.loadLogin(rootPane);
                     });
                 } catch (Exception ex) {
@@ -189,14 +189,14 @@ public void initialize(URL url, ResourceBundle rb) {
                 //Write succsesfull connection
                 if (connected) {
                     Platform.runLater(() -> {
-                        writeRconInternal("Connected to " + d.getHost() + " : " + d.getPort());
+                        writeRconInternal("Connected to " + d.getHost() + ": " + d.getPort());
                     });
                     rconSend.setDisable(false);
                     sendButton.setDisable(false);
                     sidePane.setDisable(false);
                 } else {
                     Platform.runLater(() -> {
-                        write("Couldnt connect to " + d.getHost() + " : " + d.getPort(), Color.RED);
+                        write("Couldnt connect to " + d.getHost() + ": " + d.getPort(), Color.RED);
                     });
                 }
             });

diff --git a/AdminTools/src/rconclient/gui/StatusWindow.fxml b/AdminTools/src/rconclient/gui/StatusWindow.fxml
@@ -48,8 +48,8 @@
                <children>
                   <Text layoutY="14.0" strokeType="OUTSIDE" strokeWidth="0.0" styleClass="borderPaneText" text="Server status" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
                   <ImageView fx:id="sFavicon" fitHeight="64.0" fitWidth="64.0" layoutX="14.0" layoutY="18.0" pickOnBounds="true" preserveRatio="true" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="24.0" />
-                  <Label fx:id="sVer" layoutX="18.0" layoutY="96.0" styleClass="text" text="Version : " AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="100.0" />
-                  <Label fx:id="sPlayers" layoutX="18.0" layoutY="127.0" styleClass="text" text="Players online : " AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="140.0" />
+                  <Label fx:id="sVer" layoutX="18.0" layoutY="96.0" styleClass="text" text="Version: " AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="100.0" />
+                  <Label fx:id="sPlayers" layoutX="18.0" layoutY="127.0" styleClass="text" text="Players online: " AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="140.0" />
                   <Label layoutX="373.0" layoutY="461.0" onMouseClicked="#mcStatusRefresh" styleClass="labelButton" text="Refresh" AnchorPane.bottomAnchor="12.0" AnchorPane.rightAnchor="14.0" />
                   <ListView fx:id="sOnlinePlayers" layoutX="14.0" layoutY="168.0" onMouseClicked="#handleMouseClick" prefHeight="274.0" prefWidth="384.0" AnchorPane.bottomAnchor="46.0" AnchorPane.leftAnchor="13.0" AnchorPane.rightAnchor="22.0" AnchorPane.topAnchor="167.0" />
                </children>

diff --git a/AdminTools/src/rconclient/gui/StatusWindowController.java b/AdminTools/src/rconclient/gui/StatusWindowController.java
@@ -41,7 +41,7 @@ public class StatusWindowController implements Initializable {
     private AnchorPane rootPane;
     /*
     Status dots
-    Naming scheme is :
+    Naming scheme is:
     sd<number>
     s-status
     d-tot
@@ -154,8 +154,8 @@ private void mcStatusRefresh() {
 
                 //Set all the text and images 
                 Platform.runLater(() -> {
-                    sVer.setText("Version : " + data.getVersion().getName());
-                    sPlayers.setText("Players : " + data.getPlayers().getOnline() + " / " + data.getPlayers().getMax());
+                    sVer.setText("Version: " + data.getVersion().getName());
+                    sPlayers.setText("Players: " + data.getPlayers().getOnline() + " / " + data.getPlayers().getMax());
                     sFavicon.setImage(QuerryUtils.convertToImage(data.getFavicon()));
                 });
 

diff --git a/README.md b/README.md
@@ -1,39 +1,39 @@
 # Admin Tools
-Administration tools for minecraft servers.
-Features :
+Program with administration tools for Minecraft servers.
 
+Features:
  - Dark mode
  - Rcon client
  - Server status
  - Minecraft services status (eg. authserver, api...)
  - Barebones mode
 
-For more documentation visit the [wiki](https://github.com/LukeOnuke/AdminTools/wiki) .
+For more documentation visit the [wiki](https://github.com/LukeOnuke/AdminTools/wiki).
 
-Found a bug? -Report it [here](https://github.com/LukeOnuke/AdminTools/issues/new)
+Found a bug? Report it [here](https://github.com/LukeOnuke/AdminTools/issues/new)
 
-Download : [here (github releases)](https://github.com/LukeOnuke/AdminTools/releases)
 Downloadable as:
-- **EXE installer** (witch will install the program) - **Recomended way to install**
-- JAR file with all dependencies **[Comes in a zip]**
+- [EXE installer](https://github.com/LukeOnuke/AdminTools/releases) - **recommended way to install**
+- [JAR file](https://github.com/LukeOnuke/AdminTools/releases) with all dependencies **[.zip]**
 
 ## Setup
-First run the program so it can setup files (It will error out and thats normal because it couldnt connect to a server), then folow instructions bellow
+ - Make sure your server have RCON enabled and running. 
+ - Run the installer and follow the installation steps
+ - Go to the instalation folder* and find the configuration file called `AdminTools.properties`.
 
-Go to the instalation folder and find `AdminTools.properties`
-If you installed it using a installer it is in `AppData\Local\AdminTools` folder by default.
-Example Directory - `C:\Users\lukak\AppData\Local\Admin Tools\app`
+*if installed by .exe, the directory is in AppData\Local - `C:\Users\User\AppData\Local\Admin Tools\app`  
+*if installed by .jar, the file is in the folder with the .jar
 
-In the file `AdminTools.properties` edit two valiues to your credentials
+In the configuration file edit these two values to your credentials
 
-    rcon.host=<ip of server>`
-    rcon.port=<port of rcon - 25575>
-    rcon.password=<password of server>
+    rcon.host=<rcon ip>`
+    rcon.port=<rcon port, default 25575>
+    rcon.password=<rcon password>
 
-## Galery
-Rcon 
+## Gallery
+RCON
 ![rcon](https://i.imgur.com/v8LLB6f.png)
-Status
+Server and Mojang servers status
 ![status](https://i.imgur.com/fxjDeEZ.png)
 Settings
 ![Settings](https://i.imgur.com/GbcCCAg.png)
@@ -46,9 +46,7 @@ Settings
 [MinecraftServerPing](https://github.com/jamietech/MinecraftServerPing) - by [jamietech](https://github.com/jamietech)
 
 ## Legal info
-LukeOnuke is not affiliated with Mojang Synergies AB
-"Minecraft" is a trademark of Mojang Synergies AB
-
-Gear Icon made by [Freepik](https://www.flaticon.com/authors/freepik) from www.flaticon.com
-
+LukeOnuke is not affiliated with Mojang Synergies AB.  
+"Minecraft" is a trademark of Mojang Synergies AB.  
+Gear Icon made by [Freepik](https://www.flaticon.com/authors/freepik) from www.flaticon.com  
 This program and its code is licensed on the [GNU GPL V3.0 licence](https://github.com/LukeOnuke/AdminTools/blob/master/LICENSE)