Super early 0.4.2 push before I try something.

xPXpanD · Jun 6, 2019 · a536290 · a536290
1 parent 4f95ddb
commit a536290
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+0.4.2 for ???
+Released ???
+
+    Tweaks:
+    * Removed the "PBR //" fluff from console messages as the sidemod name is already shown.
+
 0.4.1 for 7.0.5
 Released May 15th, 2019.
 

diff --git a/src/main/java/rs/expand/pixelmonbroadcasts/commands/Reload.java b/src/main/java/rs/expand/pixelmonbroadcasts/commands/Reload.java
@@ -18,9 +18,9 @@ public class Reload implements CommandExecutor
     public CommandResult execute(final CommandSource src, final CommandContext args)
     {
         if (src instanceof Player)
-            logger.info("§5PBR §f// §5Player " + src.getName() + " started a Pixelmon Broadcasts config reload.");
+            logger.info("§5Player " + src.getName() + " started a Pixelmon Broadcasts config reload.");
         else
-            logger.info("§5PBR §f// §5A Pixelmon Broadcasts config reload was started through console or blocks.");
+            logger.info("§5A Pixelmon Broadcasts config reload was started through console or blocks.");
 
         // Load up all the configs and figure out the info alias. Start printing. Methods may insert errors as they go.
         logger.info("");

diff --git a/src/main/java/rs/expand/pixelmonbroadcasts/listeners/BirdSpawnListener.java b/src/main/java/rs/expand/pixelmonbroadcasts/listeners/BirdSpawnListener.java
@@ -25,7 +25,7 @@ public void onActivateBirdShrineEvent(final PlayerActivateShrineEvent event)
                 // Print a summon message to console, if enabled.
                 logger.info
                 (
-                        "§5PBR §f// §ePlayer §6" + player.getName() +
+                        "§ePlayer §6" + player.getName() +
                         "§e has summoned a §6" + pokemonName +
                         "§e in world \"§6" + player.getEntityWorld().getWorldInfo().getWorldName() +
                         "§e\", at X:§6" + location.getX() +

diff --git a/src/main/java/rs/expand/pixelmonbroadcasts/listeners/EvolutionListener.java b/src/main/java/rs/expand/pixelmonbroadcasts/listeners/EvolutionListener.java
@@ -35,7 +35,7 @@ public void onPostEvolveEvent(final EvolveEvent.PostEvolve event)
                 // Print an evolution message to console, if enabled.
                 logger.info
                 (
-                        "§5PBR §f// §" + EventData.Others.EVOLVE.color() +
+                        '§' + EventData.Others.EVOLVE.color() +
                         "Player " + event.player.getName() +
                         "'s " + preEvoNameString +
                         " evolved into " + postEvoNameString + "."

diff --git a/src/main/java/rs/expand/pixelmonbroadcasts/listeners/PokeLootClaimListener.java b/src/main/java/rs/expand/pixelmonbroadcasts/listeners/PokeLootClaimListener.java
@@ -30,7 +30,7 @@ public void onPokeLootClaimEvent(final PokeLootClaimedEvent event)
                         // Print a loot message to console, if enabled.
                         logger.info
                         (
-                                "§5PBR §f// §" + EventData.Others.LOOT.color() +
+                                '§' + EventData.Others.LOOT.color() +
                                 "Player " + event.player.getName() +
                                 " looted " + items[0].getCount() +
                                 " " + items[0].getDisplayName() +

diff --git a/src/main/java/rs/expand/pixelmonbroadcasts/listeners/TradeListener.java b/src/main/java/rs/expand/pixelmonbroadcasts/listeners/TradeListener.java
@@ -42,7 +42,7 @@ public void onTradeCompletedEvent(final PixelmonTradeEvent event)
                 // Print a trade message to console, if enabled.
                 logger.info
                 (
-                        "§5PBR §f// §" + EventData.Others.TRADE.color() +
+                        '§' + EventData.Others.TRADE.color() +
                         "Player " + event.player1.getName() +
                         " has traded a " + pokemon1ShinyStatus + name1String +
                         " for " + event.player2.getName() +

diff --git a/src/main/java/rs/expand/pixelmonbroadcasts/utilities/PrintingMethods.java b/src/main/java/rs/expand/pixelmonbroadcasts/utilities/PrintingMethods.java
@@ -25,7 +25,7 @@ public static void logEvent(final EventData event, final String worldName, final
             {
                 logger.info
                 (
-                        "§5PBR §f// §" + event.color() +
+                        '§' + event.color() +
                         "A " + inputs[0] +
                         " has spawned in world \"" + worldName +
                         "\", at X:" + location.getX() +
@@ -38,7 +38,7 @@ else if (event.messages().length == 2) // Generally used for events that have tw
                 // An example from the battle draw event follows.
                 logger.info
                 (
-                        "§5PBR §f// §" + event.color() +
+                        '§' + event.color() +
                 //                  player 1    's battle with        player 2    ended in a draw
                         "Player " + inputs[0] + event.messages()[0] + inputs[1] + event.messages()[1] +
                         " in world \"" + worldName +
@@ -52,7 +52,7 @@ else if (event.messages().length == 2) // Generally used for events that have tw
                 // An example from the forfeit event follows.
                 logger.info
                 (
-                        "§5PBR §f// §" + event.color() +
+                        '§' + event.color() +
                 //                  player      fled from a           pokémon/trainer
                         "Player " + inputs[0] + event.messages()[0] + inputs[1] +
                         " in world \"" + worldName +