NPC Html chat messages

Signed-off-by: Rogiel <rogiel@rogiel.com>

src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java

@@ -16,6 +16,8 @@
  */
 package com.l2jserver.model.id.template;
 
+import javax.xml.bind.annotation.XmlTransient;
+
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.l2jserver.model.id.TemplateID;
@@ -40,6 +42,7 @@ public class ActorTemplateID<T extends ActorTemplate<?>> extends TemplateID<T, I
 	}
 
 	@Override
+	@XmlTransient
 	public T getTemplate() {
 		return templateService.getTemplate(this);
 	}

src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java

@@ -16,6 +16,8 @@
  */
 package com.l2jserver.model.id.template;
 
+import javax.xml.bind.annotation.XmlTransient;
+
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.l2jserver.model.id.TemplateID;
@@ -27,6 +29,7 @@ import com.l2jserver.service.game.template.TemplateService;
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
+@XmlTransient
 public class ItemTemplateID extends TemplateID<ItemTemplate, Integer> {
 	/**
 	 * The template service

src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java

@@ -16,20 +16,29 @@
  */
 package com.l2jserver.model.id.template;
 
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.l2jserver.model.id.TemplateID;
 import com.l2jserver.model.template.NPCTemplate;
 import com.l2jserver.service.game.template.TemplateService;
+import com.l2jserver.util.jaxb.NPCTemplateIDAdapter;
 
 /**
  * An {@link TemplateID} instance representing an {@link NPCTemplate} object
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
+@XmlJavaTypeAdapter(value = NPCTemplateIDAdapter.class)
 public class NPCTemplateID extends ActorTemplateID<NPCTemplate> {
 	@Inject
-	protected NPCTemplateID(@Assisted int id, TemplateService templateService) {
+	public NPCTemplateID(@Assisted int id, TemplateService templateService) {
 		super(id, templateService);
 	}
+
+	@Override
+	public NPCTemplate getTemplate() {
+		return super.getTemplate();
+	}
 }

src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java

@@ -16,18 +16,22 @@
  */
 package com.l2jserver.model.id.template;
 
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.l2jserver.model.id.TemplateID;
 import com.l2jserver.model.template.SkillTemplate;
 import com.l2jserver.model.template.TeleportationTemplate;
 import com.l2jserver.service.game.template.TemplateService;
+import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
 
 /**
  * An {@link TemplateID} instance representing an {@link SkillTemplate} object
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
+@XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
 public class TeleportationTemplateID extends
 		TemplateID<TeleportationTemplate, String> {
 	/**

src/main/java/com/l2jserver/model/template/NPCTemplate.java

@@ -29,6 +29,8 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.eclipse.persistence.oxm.annotations.XmlCDATA;
+
 import com.l2jserver.model.id.template.ItemTemplateID;
 import com.l2jserver.model.id.template.NPCTemplateID;
 import com.l2jserver.model.id.template.TeleportationTemplateID;
@@ -87,11 +89,11 @@ public class NPCTemplate extends ActorTemplate<NPC> {
 		protected ActorSex sex = null;
 
 		@XmlAttribute(name = "attackable")
-		protected Boolean attackable = null;
+		protected boolean attackable;
 		@XmlAttribute(name = "targetable")
-		protected Boolean targetable = null;
+		protected boolean targetable;
 		@XmlAttribute(name = "aggressive")
-		protected Boolean aggressive = null;
+		protected boolean aggressive;
 
 		@XmlElement(name = "stats")
 		protected NPCStatsMetadata stats = null;
@@ -246,7 +248,7 @@ public class NPCTemplate extends ActorTemplate<NPC> {
 	@XmlType(namespace = "npc")
 	public static class TeleportRegion {
 		@XmlAttribute(name = "id")
-		@XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
+		@XmlJavaTypeAdapter(value = TeleportationTemplateIDAdapter.class)
 		protected TeleportationTemplateID id;
 		@XmlAttribute(name = "price")
 		protected int price = 0;
@@ -295,6 +297,7 @@ public class NPCTemplate extends ActorTemplate<NPC> {
 		@XmlAttribute(name = "id")
 		protected String id = null;
 		@XmlValue
+		@XmlCDATA
 		protected String html = null;
 	}
 

src/main/java/com/l2jserver/model/world/npc/controller/AbstractNPCController.java

@@ -93,10 +93,16 @@ public class AbstractNPCController implements NPCController {
 	 * @return the html code
 	 */
 	protected String getHTML(NPC npc, String id) {
+		// id correction - on l2j default chat is also "0".
+		if ("0".equals(id)) // avoid NullPointerException
+			id = null;
+
 		final NPCTemplate template = npc.getTemplate();
+		String html = template.getHTML(id);
+		if (html == null)
+			return null;
 		// TODO use an decent template engine
-		return template.getHTML(id).replaceAll("%objectId%",
-				npc.getID().getID().toString());
+		return html.replaceAll("%objectId%", npc.getID().getID().toString());
 	}
 
 	/**

src/main/java/com/l2jserver/service/ServiceManager.java

@@ -57,7 +57,7 @@ public class ServiceManager {
 		}
 		logger = LoggerFactory.getLogger(ServiceManager.class);
 	}
-	
+
 	public <T extends Service> T get(Class<T> serviceClass) {
 		return injector.getInstance(serviceClass);
 	}
@@ -81,6 +81,10 @@ public class ServiceManager {
 			logger.error("{}: Error starting service: {}",
 					serviceClass.getCanonicalName(), e);
 			throw e;
+		} catch (Exception e) {
+			logger.error("{}: Error starting service: {}",
+					serviceClass.getCanonicalName(), e);
+			throw new ServiceStartException(e);
 		}
 	}
 

src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java

@@ -31,6 +31,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
@@ -55,6 +57,8 @@ import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
 @Depends({ LoggingService.class, ConfigurationService.class })
 public class XMLTemplateService extends AbstractService implements
 		TemplateService {
+	private final Logger log = LoggerFactory.getLogger(this.getClass());
+
 	private final XMLTemplateServiceConfiguration config;
 	private final NPCTemplateIDAdapter npcTemplateIdAdapter;
 	private final ItemTemplateIDAdapter itemTemplateIdAdapter;
@@ -83,9 +87,12 @@ public class XMLTemplateService extends AbstractService implements
 	@Override
 	protected void doStart() throws ServiceStartException {
 		try {
+			log.debug("Creating JAXBContext instance");
 			context = JAXBContext.newInstance(CharacterTemplate.class,
 					NPCTemplate.class, ItemTemplate.class,
 					TeleportationTemplateContainer.class);
+			
+			log.debug("Creating Unmarshaller instance");
 			unmarshaller = context.createUnmarshaller();
 
 			unmarshaller.setAdapter(NPCTemplateIDAdapter.class,
@@ -101,7 +108,9 @@ public class XMLTemplateService extends AbstractService implements
 			Collection<File> files = FileUtils
 					.listFiles(config.getTemplateDirectory(),
 							new String[] { "xml" }, true);
+			log.debug("Located {} XML template files", files.size());
 			for (final File file : files) {
+				log.debug("Loading template {}", file);
 				loadTemplate(file);
 			}
 			TeleportationTemplateContainer container = (TeleportationTemplateContainer) unmarshaller
@@ -111,6 +120,8 @@ public class XMLTemplateService extends AbstractService implements
 				templates.put(template.getID(), template);
 			}
 		} catch (JAXBException e) {
+			e.printStackTrace();
+			System.exit(0);
 			throw new ServiceStartException(e);
 		}
 	}

src/main/java/com/l2jserver/test/XMLMappingTest.java

@@ -71,8 +71,8 @@ public class XMLMappingTest {
 		//
 		// System.out.println("Took " + ((end - start) / 1000) + " seconds");
 
-		final TeleportationTemplate t = (TeleportationTemplate) u
-				.unmarshal(new File("data/templates/teleports.xml"));
+		final NPCTemplate t = (NPCTemplate) u
+				.unmarshal(new File("data/templates/npc/teleporter/30059-Trisha.xml"));
 		System.out.println(t.getName());
 	}
 }

src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java

@@ -30,6 +30,10 @@ import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;
 public class ItemTemplateIDAdapter extends XmlAdapter<Integer, ItemTemplateID> {
 	private final ItemTemplateIDProvider provider;
 
+	public ItemTemplateIDAdapter() {
+		provider = null;
+	}
+
 	@Inject
 	public ItemTemplateIDAdapter(ItemTemplateIDProvider provider) {
 		this.provider = provider;
@@ -39,6 +43,8 @@ public class ItemTemplateIDAdapter extends XmlAdapter<Integer, ItemTemplateID> {
 	public ItemTemplateID unmarshal(Integer v) throws Exception {
 		if (v == 0)
 			return null;
+		if(provider == null)
+			return new ItemTemplateID(v, null);
 		return provider.createID(v);
 	}
 

src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java

@@ -31,6 +31,10 @@ import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider;
 public class NPCTemplateIDAdapter extends XmlAdapter<Integer, NPCTemplateID> {
 	private final NPCTemplateIDProvider provider;
 
+	public NPCTemplateIDAdapter() {
+		provider = null;
+	}
+
 	@Inject
 	public NPCTemplateIDAdapter(NPCTemplateIDProvider provider) {
 		this.provider = provider;
@@ -40,6 +44,8 @@ public class NPCTemplateIDAdapter extends XmlAdapter<Integer, NPCTemplateID> {
 	public NPCTemplateID unmarshal(Integer v) throws Exception {
 		if (v == 0)
 			return null;
+		if (provider == null)
+			return new NPCTemplateID(v, null);
 		return provider.createID(v);
 	}
 

src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java

@@ -32,6 +32,10 @@ public class TeleportationTemplateIDAdapter extends
 		XmlAdapter<String, TeleportationTemplateID> {
 	private final TeleportationTemplateIDProvider provider;
 
+	public TeleportationTemplateIDAdapter() {
+		provider = null;
+	}
+
 	@Inject
 	public TeleportationTemplateIDAdapter(
 			TeleportationTemplateIDProvider provider) {
@@ -42,6 +46,8 @@ public class TeleportationTemplateIDAdapter extends
 	public TeleportationTemplateID unmarshal(String v) throws Exception {
 		if (v == null)
 			return null;
+		if (provider == null)
+			return new TeleportationTemplateID(v, null);
 		return provider.createID(v);
 	}