From 438017efcc9c425dfc8e12f7666052d95aafa34e Mon Sep 17 00:00:00 2001
From: CharonInferar <CharonInferar@aol.de>
Date: Tue, 1 Apr 2014 16:26:35 +0200
Subject: [PATCH] ResourceMessenger removed

---
 odb/resourcehistory/placeholder.txt         |  0
 odb/resourceroots/je.info.0.1               |  1 -
 odb/resourceroots/je.info.0.2               |  1 -
 odb/resourceroots/je.info.0.3               |  1 -
 odb/resourceroots/je.info.0.4               |  1 -
 odb/resourceroots/je.info.0.5               |  1 -
 odb/resourceroots/je.info.0.6               |  1 -
 odb/resourceroots/je.info.0.7               |  1 -
 odb/resourceroots/je.info.0.8               |  1 -
 odb/resourceroots/placeholder.txt           |  0
 odb/resources/je.info.0.1                   |  1 -
 odb/resources/je.info.0.2                   |  1 -
 odb/resources/je.info.0.3                   |  1 -
 odb/resources/je.info.0.4                   |  1 -
 odb/resources/je.info.0.5                   |  1 -
 odb/resources/je.info.0.6                   |  1 -
 odb/resources/je.info.0.7                   |  1 -
 odb/resources/je.info.0.8                   |  1 -
 odb/resources/placeholder.txt               |  0
 src/services/object/ObjectService.java      |  5 +--
 src/services/resources/ResourceService.java | 39 +++++++--------------
 21 files changed, 13 insertions(+), 47 deletions(-)
 create mode 100644 odb/resourcehistory/placeholder.txt
 delete mode 100644 odb/resourceroots/je.info.0.1
 delete mode 100644 odb/resourceroots/je.info.0.2
 delete mode 100644 odb/resourceroots/je.info.0.3
 delete mode 100644 odb/resourceroots/je.info.0.4
 delete mode 100644 odb/resourceroots/je.info.0.5
 delete mode 100644 odb/resourceroots/je.info.0.6
 delete mode 100644 odb/resourceroots/je.info.0.7
 delete mode 100644 odb/resourceroots/je.info.0.8
 create mode 100644 odb/resourceroots/placeholder.txt
 delete mode 100644 odb/resources/je.info.0.1
 delete mode 100644 odb/resources/je.info.0.2
 delete mode 100644 odb/resources/je.info.0.3
 delete mode 100644 odb/resources/je.info.0.4
 delete mode 100644 odb/resources/je.info.0.5
 delete mode 100644 odb/resources/je.info.0.6
 delete mode 100644 odb/resources/je.info.0.7
 delete mode 100644 odb/resources/je.info.0.8
 create mode 100644 odb/resources/placeholder.txt

diff --git a/odb/resourcehistory/placeholder.txt b/odb/resourcehistory/placeholder.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/odb/resourceroots/je.info.0.1 b/odb/resourceroots/je.info.0.1
deleted file mode 100644
index 69e6cc7b..00000000
--- a/odb/resourceroots/je.info.0.1
+++ /dev/null
@@ -1 +0,0 @@
-140331 13:22:02:468 INFO [.\odb\resourceroots]No file selected for cleaning. totalUtilization: 82 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resourceroots/je.info.0.2 b/odb/resourceroots/je.info.0.2
deleted file mode 100644
index 62909abb..00000000
--- a/odb/resourceroots/je.info.0.2
+++ /dev/null
@@ -1 +0,0 @@
-140331 15:12:49:606 INFO [.\odb\resourceroots]No file selected for cleaning. totalUtilization: 82 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resourceroots/je.info.0.3 b/odb/resourceroots/je.info.0.3
deleted file mode 100644
index 2f98a7fd..00000000
--- a/odb/resourceroots/je.info.0.3
+++ /dev/null
@@ -1 +0,0 @@
-140331 15:26:23:430 INFO [.\odb\resourceroots]No file selected for cleaning. totalUtilization: 82 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resourceroots/je.info.0.4 b/odb/resourceroots/je.info.0.4
deleted file mode 100644
index 2dd840ad..00000000
--- a/odb/resourceroots/je.info.0.4
+++ /dev/null
@@ -1 +0,0 @@
-140331 15:47:32:289 INFO [.\odb\resourceroots]No file selected for cleaning. totalUtilization: 82 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resourceroots/je.info.0.5 b/odb/resourceroots/je.info.0.5
deleted file mode 100644
index 5837e96f..00000000
--- a/odb/resourceroots/je.info.0.5
+++ /dev/null
@@ -1 +0,0 @@
-140331 16:03:13:604 INFO [.\odb\resourceroots]No file selected for cleaning. totalUtilization: 82 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resourceroots/je.info.0.6 b/odb/resourceroots/je.info.0.6
deleted file mode 100644
index 88a25b0e..00000000
--- a/odb/resourceroots/je.info.0.6
+++ /dev/null
@@ -1 +0,0 @@
-140331 16:11:26:005 INFO [.\odb\resourceroots]No file selected for cleaning. totalUtilization: 82 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resourceroots/je.info.0.7 b/odb/resourceroots/je.info.0.7
deleted file mode 100644
index 8e93d2d5..00000000
--- a/odb/resourceroots/je.info.0.7
+++ /dev/null
@@ -1 +0,0 @@
-140331 16:31:37:364 INFO [.\odb\resourceroots]No file selected for cleaning. totalUtilization: 82 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resourceroots/je.info.0.8 b/odb/resourceroots/je.info.0.8
deleted file mode 100644
index 89e441dc..00000000
--- a/odb/resourceroots/je.info.0.8
+++ /dev/null
@@ -1 +0,0 @@
-140331 16:46:40:832 INFO [.\odb\resourceroots]No file selected for cleaning. totalUtilization: 82 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resourceroots/placeholder.txt b/odb/resourceroots/placeholder.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/odb/resources/je.info.0.1 b/odb/resources/je.info.0.1
deleted file mode 100644
index 9b07b11c..00000000
--- a/odb/resources/je.info.0.1
+++ /dev/null
@@ -1 +0,0 @@
-140331 13:22:02:406 INFO [.\odb\resources]No file selected for cleaning. totalUtilization: 96 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resources/je.info.0.2 b/odb/resources/je.info.0.2
deleted file mode 100644
index 7d86171c..00000000
--- a/odb/resources/je.info.0.2
+++ /dev/null
@@ -1 +0,0 @@
-140331 15:12:49:591 INFO [.\odb\resources]No file selected for cleaning. totalUtilization: 96 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resources/je.info.0.3 b/odb/resources/je.info.0.3
deleted file mode 100644
index d8929683..00000000
--- a/odb/resources/je.info.0.3
+++ /dev/null
@@ -1 +0,0 @@
-140331 15:26:23:420 INFO [.\odb\resources]No file selected for cleaning. totalUtilization: 96 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resources/je.info.0.4 b/odb/resources/je.info.0.4
deleted file mode 100644
index 545673d1..00000000
--- a/odb/resources/je.info.0.4
+++ /dev/null
@@ -1 +0,0 @@
-140331 15:47:32:269 INFO [.\odb\resources]No file selected for cleaning. totalUtilization: 96 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resources/je.info.0.5 b/odb/resources/je.info.0.5
deleted file mode 100644
index 20f65c7d..00000000
--- a/odb/resources/je.info.0.5
+++ /dev/null
@@ -1 +0,0 @@
-140331 16:03:13:589 INFO [.\odb\resources]No file selected for cleaning. totalUtilization: 96 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resources/je.info.0.6 b/odb/resources/je.info.0.6
deleted file mode 100644
index 9c5dc2d4..00000000
--- a/odb/resources/je.info.0.6
+++ /dev/null
@@ -1 +0,0 @@
-140331 16:11:25:985 INFO [.\odb\resources]No file selected for cleaning. totalUtilization: 96 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resources/je.info.0.7 b/odb/resources/je.info.0.7
deleted file mode 100644
index 0211909a..00000000
--- a/odb/resources/je.info.0.7
+++ /dev/null
@@ -1 +0,0 @@
-140331 16:31:37:348 INFO [.\odb\resources]No file selected for cleaning. totalUtilization: 96 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resources/je.info.0.8 b/odb/resources/je.info.0.8
deleted file mode 100644
index 2211ba41..00000000
--- a/odb/resources/je.info.0.8
+++ /dev/null
@@ -1 +0,0 @@
-140331 16:46:40:817 INFO [.\odb\resources]No file selected for cleaning. totalUtilization: 96 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false
diff --git a/odb/resources/placeholder.txt b/odb/resources/placeholder.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index b0efaec9..ba493d84 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -284,7 +284,6 @@ public class ObjectService implements INetworkDispatch {
 	
 	public SWGObject createObject(String Template, long objectID, Planet planet, Point3D position, Quaternion orientation, String customServerTemplate, boolean overrideSnapshot, boolean loadServerTemplate) {
 		SWGObject object = null;
-		System.out.println("Template passed " + Template);
 		CrcStringTableVisitor crcTable;
 		try {
 			crcTable = ClientFileManager.loadFile("misc/object_template_crc_string_table.iff", CrcStringTableVisitor.class);
@@ -370,9 +369,7 @@ public class ObjectService implements INetworkDispatch {
 			object = new ResourceContainerObject(objectID, planet, Template, position, orientation);
 			
 		}else {
-			System.err.println("return null;");
-			return null;
-			
+			return null;			
 		}
 		
 		object.setPlanetId(planet.getID());
diff --git a/src/services/resources/ResourceService.java b/src/services/resources/ResourceService.java
index 11212915..a63939df 100644
--- a/src/services/resources/ResourceService.java
+++ b/src/services/resources/ResourceService.java
@@ -21,14 +21,6 @@
  ******************************************************************************/
 package services.resources;
 
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.OpenOption;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
@@ -45,15 +37,12 @@ import com.sleepycat.persist.EntityCursor;
 import protocol.swg.ResourceMessenger;
 import protocol.swg.SceneCreateObjectByCrc;
 import protocol.swg.SceneEndBaselines;
+import protocol.swg.UpdateContainmentMessage;
 import main.NGECore;
 import engine.resources.common.CRC;
-import engine.resources.container.CreaturePermissions;
-import engine.resources.container.Traverser;
 import engine.resources.objects.SWGObject;
-import engine.resources.scene.Planet;
 import engine.resources.service.INetworkDispatch;
 import engine.resources.service.INetworkRemoteEvent;
-import resources.objects.building.BuildingObject;
 import resources.objects.creature.CreatureObject;
 import resources.objects.resource.GalacticResource;
 import resources.objects.resource.ResourceContainerObject;
@@ -63,8 +52,6 @@ import resources.objects.resource.ResourceRoot;
  * @author Charon 
  */
 
-// ToDo: Persistence management control / persistence verification queries
-
 public class ResourceService implements INetworkDispatch {
 	
 	private NGECore core;
@@ -10720,7 +10707,7 @@ public class ResourceService implements INetworkDispatch {
 		int indices = resourceRootTable.size();
 		for (int i=0;i<indices;i++){
 			ResourceRoot persistRoot = resourceRootTable.get(new Integer(i));
-			System.err.println("persistRoot ID " + persistRoot.getResourceRootID() +" " + persistRoot.getResourceType());
+			System.err.println("Persisting Root with ID " + persistRoot.getResourceRootID() +" " + persistRoot.getResourceFileName());
 			persistRoot.createTransaction(core.getResourceRootsODB().getEnvironment());
 			core.getResourceRootsODB().put(persistRoot, Integer.class, ResourceRoot.class, persistRoot.getTransaction());
 			persistRoot.getTransaction().commitSync();		
@@ -10944,7 +10931,7 @@ public class ResourceService implements INetworkDispatch {
 			return false;
 		bigBangOccured = true;
 		
-		
+		System.out.println("Persisting resources...");
 		// Database table ResourceRootData
 		
 		// ID
@@ -11094,6 +11081,7 @@ public class ResourceService implements INetworkDispatch {
 //		}
 		
 		System.out.println(allSpawnedResources.size() + " RESOURCES SPAWNED.");
+		System.out.println("Finished persisting resources.");
 		return true;
 	}
 		
@@ -11299,11 +11287,11 @@ public class ResourceService implements INetworkDispatch {
 			for (GalacticResource sampleResource : allSpawnedResources){
 				if (sampleResource.getResourceRoot().getResourceClass().contains(spawnType)){
 					String resourceContainerIFF = ResourceRoot.CONTAINER_TYPE_IFF_SIGNIFIER[sampleResource.getResourceRoot().getContainerType()];           		  				
-    				containerObject = (ResourceContainerObject) core.objectService.createObject(resourceContainerIFF, crafter.getPlanet());
-    				containerObject.initializeStats(sampleResource);
+    				containerObject = (ResourceContainerObject) core.objectService.createObject(resourceContainerIFF, crafter.getPlanet());  				
     				containerObject.setProprietor(crafter);
+    				containerObject.setStackCount(stackCount,false);
     				//int stackCount = core.resourceService.getResourceSampleQuantity(crafter, sampleResource); 
-            		containerObject.setStackCount(stackCount,false);            		          		
+    				containerObject.initializeStats(sampleResource);            		          		
             		int resCRC = CRC.StringtoCRC(resourceContainerIFF);
     				containerObject.setIffFileName(resourceContainerIFF);             		
     				long objectId = containerObject.getObjectID();  					
@@ -11311,16 +11299,13 @@ public class ResourceService implements INetworkDispatch {
     				SceneCreateObjectByCrc createObjectMsg = new SceneCreateObjectByCrc(objectId, crafter.getOrientation().x, crafter.getOrientation().y, crafter.getOrientation().z, crafter.getOrientation().w, crafter.getPosition().x, crafter.getPosition().y, crafter.getPosition().z, resCRC, (byte) 0);
     				crafter.getClient().getSession().write(createObjectMsg.serialize());      				
     				services.resources.CharonPacketUtils.printAnalysis(createObjectMsg.serialize());				
-    				ResourceMessenger messenger = new ResourceMessenger(IoBuffer.allocate(1));
-   				 	crafter.getClient().getSession().write(messenger.serialize_buildUpdateContainmentMessage(containerObject, crafterInventory));      				
-   				    crafter.getClient().getSession().write(messenger.serialize_buildRCNO3Baseline(containerObject));
-   				    crafter.getClient().getSession().write(messenger.serialize_buildRCNO6Baseline(containerObject));
-   				    crafter.getClient().getSession().write(messenger.serialize_buildRCNO8Baseline(containerObject));
-				    crafter.getClient().getSession().write(messenger.serialize_buildRCNO9Baseline(containerObject));       
+    				UpdateContainmentMessage updateContainmentMessage= new UpdateContainmentMessage(containerObject.getObjectID(), crafterInventory.getObjectID(), -1);
+					crafter.getClient().getSession().write(updateContainmentMessage.serialize());
+					containerObject.sendBaselines(crafter.getClient());     
     				SceneEndBaselines sceneEndBaselinesMsg = new SceneEndBaselines(containerObject.getObjectID());
     				crafter.getClient().getSession().write(sceneEndBaselinesMsg.serialize());
-    				services.resources.CharonPacketUtils.printAnalysis(sceneEndBaselinesMsg.serialize());
-    				crafter.getClient().getSession().write(messenger.serialize_buildAttributeListMessage(containerObject));					
+    				services.resources.CharonPacketUtils.printAnalysis(sceneEndBaselinesMsg.serialize());   				 				
+    				//containerObject.buildAttributeListMessage(crafter.getClient());
     				return containerObject;
 				}
 			}