aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/miscutil/core/handler/events/LoginEventHandler.java2
-rw-r--r--src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java7
-rw-r--r--src/Java/miscutil/core/lib/CORE.java2
-rw-r--r--src/Java/miscutil/core/util/player/PlayerCache.java83
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java3
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java16
6 files changed, 76 insertions, 37 deletions
diff --git a/src/Java/miscutil/core/handler/events/LoginEventHandler.java b/src/Java/miscutil/core/handler/events/LoginEventHandler.java
index 3efe8cea34..12c8578735 100644
--- a/src/Java/miscutil/core/handler/events/LoginEventHandler.java
+++ b/src/Java/miscutil/core/handler/events/LoginEventHandler.java
@@ -28,7 +28,9 @@ public class LoginEventHandler {
if (localPlayerRef instanceof EntityPlayerMP && localPlayerRef != null){
//Populates player cache
+ if (!localPlayerRef.worldObj.isRemote){
PlayerCache.appendParamChanges(localPlayersName, localPlayersUUID.toString());
+ }
/*if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009") || localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){
diff --git a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
index 2445229a11..dff067d9c7 100644
--- a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
+++ b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
@@ -33,12 +33,15 @@ public class PickaxeBlockBreakEventHandler {
if (X instanceof GregtechMetaSafeBlockBase){
UUID ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID;
- String accessorUUID = playerInternal.getUniqueID().toString();
+ UUID accessorUUID = playerInternal.getUniqueID();
Utils.LOG_WARNING("Owner UUID: "+ownerUUID);
Utils.LOG_WARNING("Accessor UUID: "+accessorUUID);
if (((GregtechMetaSafeBlockBase)X).bUnbreakable){
- if (accessorUUID.equals(ownerUUID)){
+
+ Utils.LOG_INFO("UUID info. Accessor: "+accessorUUID + " | Owner: "+ownerUUID);
+
+ if (accessorUUID == ownerUUID){
Utils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed.");
event.setCanceled(false);
}
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 6538790a6f..a02da08339 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -19,7 +19,7 @@ public class CORE {
public static final String name = "GT++";
public static final String MODID = "miscutils";
public static final String VERSION = "1.4.3.9-release";
- public static boolean DEBUG = false;
+ public static boolean DEBUG = true;
public static final boolean LOAD_ALL_CONTENT = false;
public static final int GREG_FIRST_ID = 760;
public static Map PlayerCache;
diff --git a/src/Java/miscutil/core/util/player/PlayerCache.java b/src/Java/miscutil/core/util/player/PlayerCache.java
index d1c40ec3fc..ce43ccf36a 100644
--- a/src/Java/miscutil/core/util/player/PlayerCache.java
+++ b/src/Java/miscutil/core/util/player/PlayerCache.java
@@ -7,6 +7,7 @@ import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
@@ -17,6 +18,8 @@ import java.util.UUID;
import miscutil.core.lib.CORE;
import miscutil.core.util.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.World;
public class PlayerCache {
@@ -46,7 +49,7 @@ public class PlayerCache {
props.setProperty(playerName+" ", playerUUIDasString);
OutputStream out = new FileOutputStream(cache);
props.store(out, "Player Cache.");
- Utils.LOG_INFO("Created an empty PlayerCache.dat for future use.");
+ Utils.LOG_INFO("PlayerCache.dat created for future use.");
}
catch (Exception e ) {
e.printStackTrace();
@@ -54,12 +57,14 @@ public class PlayerCache {
}
public static void appendParamChanges(String playerName, String playerUUIDasString) {
- Properties properties = new Properties();
- try {
+ HashMap<String, UUID> playerInfo = new HashMap<String, UUID>();
+ playerInfo.put(playerName, UUID.fromString(playerUUIDasString));
+
+ /*try {
Utils.LOG_INFO("Attempting to load "+cache.getName());
properties.load(new FileInputStream(cache));
if (properties == null || properties.equals(null)){
- Utils.LOG_WARNING("Null properties");
+ Utils.LOG_INFO("Please wait.");
}
else {
Utils.LOG_INFO("Loaded PlayerCache.dat");
@@ -69,7 +74,19 @@ public class PlayerCache {
fr.close();
}
- } catch (IOException e) {
+ } */
+
+ try
+ {
+ FileOutputStream fos = new FileOutputStream("PlayerCache.dat");
+ ObjectOutputStream oos = new ObjectOutputStream(fos);
+ oos.writeObject(playerInfo);
+ oos.close();
+ fos.close();
+ Utils.LOG_INFO("Serialized Player data saved in PlayerCache.dat");
+ }
+
+ catch (IOException e) {
Utils.LOG_INFO("No PlayerCache file found, creating one.");
createPropertiesFile(playerName, playerUUIDasString);
}
@@ -92,7 +109,7 @@ public class PlayerCache {
public static Map<String, String> readPropertiesFileAsMapOld() throws Exception {
String delimiter = "=";
@SuppressWarnings({ "rawtypes", "unchecked" })
- Map<String, String> map = new HashMap();
+ Map<String, String> map = new HashMap<String, String>();
BufferedReader reader = new BufferedReader(new FileReader(cache));
String line;
while ((line = reader.readLine()) != null)
@@ -117,7 +134,7 @@ public class PlayerCache {
{
FileInputStream fis = new FileInputStream(cache);
ObjectInputStream ois = new ObjectInputStream(fis);
- map = (HashMap) ois.readObject();
+ map = (HashMap<String, UUID>) ois.readObject();
ois.close();
fis.close();
}catch(IOException ioe)
@@ -126,33 +143,47 @@ public class PlayerCache {
return null;
}catch(ClassNotFoundException c)
{
- System.out.println("Class not found");
+ Utils.LOG_INFO("Class not found");
c.printStackTrace();
return null;
}
- System.out.println("Deserialized HashMap..");
+ Utils.LOG_WARNING("Deserialized PlayerCache..");
return map;
}
public static String lookupPlayerByUUID(UUID UUID){
+
try {
- Map<String, UUID> map = null;
- try {
- map = readPropertiesFileAsMap();
- } catch (Exception e) {
- Utils.LOG_ERROR("With "+e.getCause()+" as cause, Caught Exception: "+e.toString());
- //e.printStackTrace();
- }
- for (Entry<String, UUID> entry : map.entrySet()) {
- if (Objects.equals(UUID, entry.getValue())) {
- return entry.getKey();
- }
- }
- return null;
- } catch (NullPointerException e) {
- Utils.LOG_ERROR("With "+e.getCause()+" as cause, Caught Exception: "+e.toString());
- //e.printStackTrace();
- }
+ World worldw = Minecraft.getMinecraft().thePlayer.worldObj;
+ //if (!worldw.isRemote){
+
+
+ try {
+ Map<String, UUID> map = null;
+ try {
+ map = readPropertiesFileAsMap();
+ } catch (Exception e) {
+ Utils.LOG_INFO("With "+e.getCause()+" as cause, Caught Exception: "+e.toString());
+ //e.printStackTrace();
+ }
+ for (Entry<String, UUID> entry : map.entrySet()) {
+ if (Objects.equals(UUID, entry.getValue())) {
+ return entry.getKey();
+ }
+ }
+ return null;
+ } catch (NullPointerException e) {
+ Utils.LOG_INFO("With "+e.getCause()+" as cause, Caught Exception: "+e.toString());
+ //e.printStackTrace();
+ }
+
+
+ //}
+
+
+ } catch (Throwable r){
+ Utils.LOG_INFO("With "+r.getCause()+" as cause, Caught Exception: "+r.toString());
+ }
return null;
}
}
diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
index 211e120247..6c3d871d33 100644
--- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
@@ -4,7 +4,6 @@ import gregtech.api.util.GT_Config;
import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-import miscutil.core.xmod.gregtech.loaders.Processing_HotIngots;
public class HANDLER_GT {
@@ -20,7 +19,7 @@ public class HANDLER_GT {
//new Processing_Plate1();
//new Processing_Block();
}
- new Processing_HotIngots();
+ //new Processing_HotIngots();
}
public static void init(){
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
index d9d69dc294..991f1b5d6e 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
@@ -192,15 +192,19 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
}
if (!aPlayer.equals(null)) {
UUID tempUUID = aPlayer.getUniqueID();
- PlayerCache.appendParamChanges(aPlayer.getDisplayName(), aPlayer.getUniqueID().toString());
- if (ownerUUID.equals("")){
- Utils.LOG_WARNING("No owner yet for this block.");
+ /*if (!aPlayer.worldObj.isRemote){
+ //PlayerCache.appendParamChanges(aPlayer.getDisplayName(), aPlayer.getUniqueID().toString());
+ }*/
+ //Utils.LOG_INFO("test");
+ if (ownerUUID == null){
+ Utils.LOG_INFO("No owner yet for this block.");
}
else {
- Utils.LOG_WARNING("Current Owner: "+PlayerCache.lookupPlayerByUUID(ownerUUID)+" - UUID: "+ownerUUID);
+ //Utils.LOG_INFO("test");
+ Utils.LOG_INFO("Current Owner: "+PlayerCache.lookupPlayerByUUID(ownerUUID)+" - UUID: "+ownerUUID);
}
Utils.LOG_WARNING("Is ownerUUID Null");
- if (ownerUUID.equals("")){
+ if (ownerUUID == null){
Utils.LOG_WARNING("OwnerUUID is Null, let's set it.");
Utils.LOG_WARNING("Accessing Players UUID is: "+tempUUID);
ownerUUID = tempUUID;
@@ -209,7 +213,7 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
}
Utils.LOG_WARNING("No, it is not.");
Utils.LOG_WARNING("Checking ownerUUID.");
- if (!ownerUUID.equals(null)){
+ if (ownerUUID != null){
Utils.LOG_WARNING("ownerUUID != Null, if accessor == owner.");
Utils.LOG_WARNING("Accessing is: "+PlayerCache.lookupPlayerByUUID(tempUUID));
if (ownerUUID.equals(tempUUID)){
generated by cgit (git 2.46.0) at 2025-03-10 10:42:04 +0000