$ Fixed the getItemStackInPlayersHand method, now it has variable server/client versions, all with various constructors. (World/String/UUID) - Closes #31

% Moved a heap of Code to separate Utils classes.

2 files changed, 5 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
index 1db26846c7..e529d47699 100644
--- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.handler.events;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerCache;
+import gtPlusPlus.core.util.player.PlayerUtils;
 
 import java.util.UUID;
 
@@ -37,7 +38,7 @@ public class LoginEventHandler {
 					Utils.LOG_INFO("You're not using the latest recommended version of GT++, consider updating.");
 					Utils.LOG_INFO("Latest version is: "+CORE.MASTER_VERSION);
 					Utils.LOG_INFO("You currently have: "+CORE.VERSION);
-					Utils.messagePlayer(localPlayerRef, "You're not using the latest recommended version of GT++, consider updating.");
+					PlayerUtils.messagePlayer(localPlayerRef, "You're not using the latest recommended version of GT++, consider updating.");
 				}
 				else {
 					Utils.LOG_INFO("You're using the latest recommended version of GT++.");					
diff --git a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
index a7c689a79a..49b844f057 100644
--- a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java
@@ -5,6 +5,7 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaSafeBlockBase;
 
 import java.util.UUID;
@@ -42,12 +43,12 @@ public class PickaxeBlockBreakEventHandler {
 							Utils.LOG_INFO("UUID info. Accessor: "+accessorUUID + " | Owner: "+ownerUUID);
 							
 							if (accessorUUID == ownerUUID){							
-								Utils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed.");
+								PlayerUtils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed.");
 								event.setCanceled(false);
 							}
 							else {
 								event.setCanceled(true);
-								Utils.messagePlayer(playerInternal, "Since you do not own this block, it has not been destroyed.");
+								PlayerUtils.messagePlayer(playerInternal, "Since you do not own this block, it has not been destroyed.");
 							}
 							//
 						}