repeats = queue.getTimerTasks();
+ for (Integer key : repeats.keySet()) {
+ for (TaskQueue.RepeatEntry entry : repeats.get(key)) {
+ SaveGameModel.TimerEvent event = new SaveGameModel.TimerEvent();
+ event.tick = key + ":" + entry.getPeriod() + ":" + entry.getStop();
+
+ if (entry.getScript() != null) {
+ event.taskType = "script";
+ event.script = entry.getScript();
+ } else if (entry.getTask() instanceof MagicTask) {
+ event.taskType = "magic";
+ Spell spell = ((MagicTask) entry.getTask()).getSpell();
+ event.effect = spell.getEffect().name();
+ if (spell.getTarget() != null) {
+ event.target = spell.getTarget().getUID();
+ }
+ if (spell.getCaster() != null) {
+ event.caster = spell.getCaster().getUID();
+ }
+ if (spell.getScript() != null) {
+ event.script = spell.getScript();
+ }
+ event.spellType = spell.getType().name();
+ event.magnitude = spell.getMagnitude();
+ }
+
+ events.timerEvents.add(event);
+ }
+ }
+
+ return events;
+ }
+
+ private SaveGameModel.PlayerSaveData buildPlayerData(Player player) {
+ SaveGameModel.PlayerSaveData data = new SaveGameModel.PlayerSaveData();
+
+ // Basic attributes
+ data.name = player.getName();
+ data.race = player.species.id;
+ data.gender = player.getGender().toString().toLowerCase();
+ data.specialisation = player.getSpecialisation().toString();
+ data.profession = player.getProfession();
+ data.sign = player.getSign();
+
+ // Position
+ Atlas atlas = Engine.getAtlas();
+ data.map = atlas.getCurrentMap().getUID();
+ data.level = atlas.getCurrentZoneIndex();
+ Rectangle bounds = player.getShapeComponent();
+ data.x = bounds.x;
+ data.y = bounds.y;
+
+ // Skills
+ data.skills = new SaveGameModel.SkillsData();
+ for (Skill s : Skill.values()) {
+ float skillValue = player.getSkill(s);
+ setSkillValue(data.skills, s, skillValue);
+ }
+
+ // Stats
+ data.stats = new SaveGameModel.StatsData();
+ data.stats.str = player.getStatsComponent().getStr();
+ data.stats.con = player.getStatsComponent().getCon();
+ data.stats.dex = player.getStatsComponent().getDex();
+ data.stats.int_ = player.getStatsComponent().getInt();
+ data.stats.wis = player.getStatsComponent().getWis();
+ data.stats.cha = player.getStatsComponent().getCha();
+
+ // Money
+ data.money = new SaveGameModel.MoneyData();
+ data.money.value = player.getInventoryComponent().getMoney();
+
+ // Items
+ for (long uid : player.getInventoryComponent()) {
+ SaveGameModel.ItemReference item = new SaveGameModel.ItemReference();
+ item.uid = uid;
+ data.items.add(item);
+ }
+
+ // Spells and powers
+ for (RSpell s : player.getMagicComponent().getSpells()) {
+ SaveGameModel.SpellReference spell = new SaveGameModel.SpellReference();
+ spell.id = s.id;
+ data.spells.add(spell);
+ }
+
+ for (RSpell p : player.getMagicComponent().getPowers()) {
+ SaveGameModel.SpellReference spell = new SaveGameModel.SpellReference();
+ spell.id = p.id;
+ data.spells.add(spell);
+ }
+
+ // Feats
+ for (Feat f : player.getCharacteristicsComponent().getFeats()) {
+ SaveGameModel.FeatReference feat = new SaveGameModel.FeatReference();
+ feat.name = f.toString();
+ data.feats.add(feat);
+ }
+
+ return data;
+ }
+
+ private void setSkillValue(SaveGameModel.SkillsData skills, Skill skill, float value) {
+ switch (skill) {
+ case CREATION:
+ skills.CREATION = value;
+ break;
+ case DESTRUCTION:
+ skills.DESTRUCTION = value;
+ break;
+ case RESTORATION:
+ skills.RESTORATION = value;
+ break;
+ case ALTERATION:
+ skills.ALTERATION = value;
+ break;
+ case ILLUSION:
+ skills.ILLUSION = value;
+ break;
+ case ENCHANT:
+ skills.ENCHANT = value;
+ break;
+ case ALCHEMY:
+ skills.ALCHEMY = value;
+ break;
+ case CONJURATION:
+ skills.CONJURATION = value;
+ break;
+ case ARCHERY:
+ skills.ARCHERY = value;
+ break;
+ case AXE:
+ skills.AXE = value;
+ break;
+ case BLUNT:
+ skills.BLUNT = value;
+ break;
+ case BLADE:
+ skills.BLADE = value;
+ break;
+ case SPEAR:
+ skills.SPEAR = value;
+ break;
+ case UNARMED:
+ skills.UNARMED = value;
+ break;
+ case CLIMBING:
+ skills.CLIMBING = value;
+ break;
+ case SWIMMING:
+ skills.SWIMMING = value;
+ break;
+ case SNEAK:
+ skills.SNEAK = value;
+ break;
+ case HEAVY_ARMOR:
+ skills.HEAVY_ARMOR = value;
+ break;
+ case MEDIUM_ARMOR:
+ skills.MEDIUM_ARMOR = value;
+ break;
+ case LIGHT_ARMOR:
+ skills.LIGHT_ARMOR = value;
+ break;
+ case DODGING:
+ skills.DODGING = value;
+ break;
+ case BLOCK:
+ skills.BLOCK = value;
+ break;
+ case UNARMORED:
+ skills.UNARMORED = value;
+ break;
+ case MERCANTILE:
+ skills.MERCANTILE = value;
+ break;
+ case PICKPOCKET:
+ skills.PICKPOCKET = value;
+ break;
+ case ARMORER:
+ skills.ARMORER = value;
+ break;
+ case LOCKPICKING:
+ skills.LOCKPICKING = value;
+ break;
+ case MEDICAL:
+ skills.MEDICAL = value;
+ break;
+ case DISABLE:
+ skills.DISABLE = value;
+ break;
+ case SPEECHCRAFT:
+ skills.SPEECHCRAFT = value;
+ break;
+ case PERFORM:
+ skills.PERFORM = value;
+ break;
+ case DISGUISE:
+ skills.DISGUISE = value;
+ break;
+ case RIDING:
+ skills.RIDING = value;
+ break;
+ case NONE:
+ skills.NONE = value;
+ break;
+ }
+ }
+
+ private SaveGameModel.JournalData buildJournalData(Player player) {
+ SaveGameModel.JournalData journal = new SaveGameModel.JournalData();
+
+ for (String q : player.getJournal().getQuests().keySet()) {
+ SaveGameModel.QuestEntry quest = new SaveGameModel.QuestEntry();
+ quest.id = q;
+ quest.stage = player.getJournal().getQuests().get(q);
+ quest.subject = player.getJournal().getSubjects().get(q);
+ journal.quests.add(quest);
+ }
+
+ return journal;
+ }
+}
diff --git a/src/main/java/neon/core/model/NeonConfig.java b/src/main/java/neon/core/model/NeonConfig.java
new file mode 100644
index 0000000..ca8e266
--- /dev/null
+++ b/src/main/java/neon/core/model/NeonConfig.java
@@ -0,0 +1,60 @@
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2026 - Peter Riewe
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.core.model;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+/**
+ * Jackson model for neon.ini.xml configuration file.
+ *
+ * @author priewe
+ */
+@JacksonXmlRootElement(localName = "root")
+public class NeonConfig {
+
+ @JacksonXmlProperty(localName = "files")
+ public FilesElement files = new FilesElement();
+
+ @JacksonXmlProperty(localName = "threads")
+ public ThreadsElement threads = new ThreadsElement();
+
+ @JacksonXmlProperty(localName = "ai")
+ public String ai;
+
+ @JacksonXmlProperty(localName = "log")
+ public String log;
+
+ @JacksonXmlProperty(localName = "lang")
+ public String lang;
+
+ @JacksonXmlProperty(localName = "keys")
+ public String keys;
+
+ /** Empty files element */
+ public static class FilesElement {
+ // Empty element placeholder
+ }
+
+ /** Threads configuration */
+ public static class ThreadsElement {
+ @JacksonXmlProperty(isAttribute = true, localName = "generate")
+ public String generate;
+ }
+}
diff --git a/src/main/java/neon/core/model/SaveGameModel.java b/src/main/java/neon/core/model/SaveGameModel.java
new file mode 100644
index 0000000..68d234a
--- /dev/null
+++ b/src/main/java/neon/core/model/SaveGameModel.java
@@ -0,0 +1,337 @@
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2026 - Peter Riewe
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.core.model;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Jackson model for save game XML structure.
+ *
+ * This class represents the parsed XML structure of a save game file. It is designed to separate
+ * XML parsing (Jackson's responsibility) from game object construction (GameLoader's
+ * responsibility).
+ *
+ * @author priewe
+ */
+@JacksonXmlRootElement(localName = "save")
+public class SaveGameModel {
+
+ @JacksonXmlProperty(isAttribute = true, localName = "version")
+ public String version = "2.0"; // Add versioning for future compatibility
+
+ @JacksonXmlProperty(localName = "player")
+ public PlayerSaveData player;
+
+ @JacksonXmlProperty(localName = "journal")
+ public JournalData journal = new JournalData();
+
+ @JacksonXmlProperty(localName = "events")
+ public EventsData events = new EventsData();
+
+ @JacksonXmlProperty(localName = "timer")
+ public TimerData timer;
+
+ @JacksonXmlProperty(localName = "quests")
+ public QuestsData quests; // Optional - null if no random quests
+
+ /** Player save data */
+ public static class PlayerSaveData {
+ @JacksonXmlProperty(isAttribute = true, localName = "name")
+ public String name;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "race")
+ public String race;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "gender")
+ public String gender;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "spec")
+ public String specialisation;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "prof")
+ public String profession;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "sign")
+ public String sign;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "map")
+ public int map;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "l")
+ public int level;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "x")
+ public int x;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "y")
+ public int y;
+
+ @JacksonXmlProperty(localName = "skills")
+ public SkillsData skills;
+
+ @JacksonXmlProperty(localName = "stats")
+ public StatsData stats;
+
+ @JacksonXmlProperty(localName = "money")
+ public MoneyData money;
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "item")
+ public List items = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "spell")
+ public List spells = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "feat")
+ public List feats = new ArrayList<>();
+ }
+
+ /** Skills data stored as XML attributes */
+ public static class SkillsData {
+ // Skills are stored as XML attributes - use @JacksonXmlProperty for each skill
+ // All 38 skills from the Skill enum
+ @JacksonXmlProperty(isAttribute = true, localName = "CREATION")
+ public Float CREATION;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "DESTRUCTION")
+ public Float DESTRUCTION;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "RESTORATION")
+ public Float RESTORATION;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "ALTERATION")
+ public Float ALTERATION;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "ILLUSION")
+ public Float ILLUSION;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "ENCHANT")
+ public Float ENCHANT;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "ALCHEMY")
+ public Float ALCHEMY;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "CONJURATION")
+ public Float CONJURATION;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "ARCHERY")
+ public Float ARCHERY;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "AXE")
+ public Float AXE;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "BLUNT")
+ public Float BLUNT;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "BLADE")
+ public Float BLADE;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "SPEAR")
+ public Float SPEAR;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "UNARMED")
+ public Float UNARMED;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "CLIMBING")
+ public Float CLIMBING;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "SWIMMING")
+ public Float SWIMMING;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "SNEAK")
+ public Float SNEAK;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "HEAVY_ARMOR")
+ public Float HEAVY_ARMOR;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "MEDIUM_ARMOR")
+ public Float MEDIUM_ARMOR;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "LIGHT_ARMOR")
+ public Float LIGHT_ARMOR;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "DODGING")
+ public Float DODGING;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "BLOCK")
+ public Float BLOCK;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "UNARMORED")
+ public Float UNARMORED;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "MERCANTILE")
+ public Float MERCANTILE;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "PICKPOCKET")
+ public Float PICKPOCKET;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "ARMORER")
+ public Float ARMORER;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "LOCKPICKING")
+ public Float LOCKPICKING;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "MEDICAL")
+ public Float MEDICAL;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "DISABLE")
+ public Float DISABLE;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "SPEECHCRAFT")
+ public Float SPEECHCRAFT;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "PERFORM")
+ public Float PERFORM;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "DISGUISE")
+ public Float DISGUISE;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "RIDING")
+ public Float RIDING;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "NONE")
+ public Float NONE;
+ }
+
+ /** Stats data */
+ public static class StatsData {
+ @JacksonXmlProperty(isAttribute = true, localName = "str")
+ public int str;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "con")
+ public int con;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "dex")
+ public int dex;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "int")
+ public int int_;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "wis")
+ public int wis;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "cha")
+ public int cha;
+ }
+
+ /** Money data */
+ public static class MoneyData {
+ @JacksonXmlText public int value;
+ }
+
+ /** Item reference */
+ public static class ItemReference {
+ @JacksonXmlProperty(isAttribute = true, localName = "uid")
+ public long uid;
+ }
+
+ /** Spell reference */
+ public static class SpellReference {
+ @JacksonXmlText public String id;
+ }
+
+ /** Feat reference */
+ public static class FeatReference {
+ @JacksonXmlText public String name;
+ }
+
+ /** Journal data */
+ public static class JournalData {
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "quest")
+ public List quests = new ArrayList<>();
+ }
+
+ /** Quest entry */
+ public static class QuestEntry {
+ @JacksonXmlProperty(isAttribute = true, localName = "id")
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "stage")
+ public int stage;
+
+ @JacksonXmlText public String subject;
+ }
+
+ /** Events data */
+ public static class EventsData {
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "task")
+ public List tasks = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "timer")
+ public List timerEvents = new ArrayList<>();
+ }
+
+ /** Task event */
+ public static class TaskEvent {
+ @JacksonXmlProperty(isAttribute = true, localName = "desc")
+ public String description;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "script")
+ public String script;
+ }
+
+ /** Timer event */
+ public static class TimerEvent {
+ @JacksonXmlProperty(isAttribute = true, localName = "tick")
+ public String tick; // Format: "start:period:stop"
+
+ @JacksonXmlProperty(isAttribute = true, localName = "task")
+ public String taskType; // "script" or "magic"
+
+ @JacksonXmlProperty(isAttribute = true, localName = "script")
+ public String script;
+
+ // Magic task attributes
+ @JacksonXmlProperty(isAttribute = true, localName = "effect")
+ public String effect;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "target")
+ public Long target;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "caster")
+ public Long caster;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "stype")
+ public String spellType;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "mag")
+ public Float magnitude;
+ }
+
+ /** Timer data */
+ public static class TimerData {
+ @JacksonXmlProperty(isAttribute = true, localName = "ticks")
+ public int ticks;
+ }
+
+ /** Quests data (for random quests - currently unused) */
+ public static class QuestsData {
+ // Empty for now, placeholder for future random quest saving
+ }
+}
diff --git a/src/main/java/neon/editor/DataStore.java b/src/main/java/neon/editor/DataStore.java
index 681c8bf..85e92de 100644
--- a/src/main/java/neon/editor/DataStore.java
+++ b/src/main/java/neon/editor/DataStore.java
@@ -53,6 +53,18 @@ public Multimap getEvents() {
return events;
}
+ /**
+ * Loads all data from a mod.
+ *
+ * NOTE (Phase 6 - Minimal Migration): Currently uses JDOM constructors for resource loading.
+ * Full migration to Jackson constructors deferred to Phase 7 when JDOM constructors are removed
+ * from resource classes. Maps already save via Jackson (Phase 2D), but resource loading still
+ * uses JDOM via XMLTranslator, similar to ModLoader.
+ *
+ * @param root the mod path
+ * @param active whether this is the active mod
+ * @param extension whether the mod is an extension
+ */
public void loadData(String root, boolean active, boolean extension) {
RMod mod = new RMod(loadInfo(root, "main.xml"), loadCC(root, "cc.xml"), root);
if (active) {
diff --git a/src/main/java/neon/editor/JacksonXmlBuilder.java b/src/main/java/neon/editor/JacksonXmlBuilder.java
new file mode 100644
index 0000000..262c0b8
--- /dev/null
+++ b/src/main/java/neon/editor/JacksonXmlBuilder.java
@@ -0,0 +1,227 @@
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.editor;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import neon.resources.RData;
+import neon.resources.RMod;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+/**
+ * Jackson-based XML document builder for serializing game resources.
+ *
+ *
This class replaces {@link XMLBuilder} as part of Phase 7A of the JDOM-to-Jackson migration.
+ * It uses Jackson for events serialization and leverages the existing {@code toElement()} bridge
+ * pattern for resources (as established in RSpell, RCreature, and RMod).
+ *
+ *
Phase 7A Scope: This class still produces JDOM Documents for compatibility with the
+ * existing {@code ModFiler.saveFile(Document)} API. In Phase 7B, when {@code toElement()} methods
+ * are removed from all resources, this class will be updated to serialize directly to
+ * ByteArrayOutputStream without the JDOM intermediate representation.
+ *
+ *
Migration Path:
+ *
+ *
+ * - Phase 7A (current): XMLBuilder → JacksonXmlBuilder (this class)
+ *
- Phase 7B: Remove toElement() from resources, update this class to skip JDOM
+ *
- Phase 7C: Direct Jackson serialization, eliminate this class
+ *
+ *
+ * @author mdriesen
+ */
+public class JacksonXmlBuilder {
+ private final JacksonMapper mapper = new JacksonMapper();
+ private final DataStore store;
+
+ /**
+ * Creates a new JacksonXmlBuilder.
+ *
+ * @param store the data store containing events and active mod information
+ */
+ public JacksonXmlBuilder(DataStore store) {
+ this.store = store;
+ }
+
+ /**
+ * Creates an events XML document using Jackson serialization.
+ *
+ * Serializes the scheduled game events from {@code DataStore.getEvents()} into an XML document
+ * with the structure:
+ *
+ *
{@code
+ *
+ *
+ *
+ *
+ * }
+ *
+ * @return JDOM Document containing events
+ */
+ public Document getEventsDoc() {
+ EventsModel model = new EventsModel();
+ model.events = new ArrayList<>();
+
+ // Convert Multimap to List
+ for (Map.Entry> entry : store.getEvents().asMap().entrySet()) {
+ String script = entry.getKey();
+ for (String tick : entry.getValue()) {
+ EventsModel.Event event = new EventsModel.Event();
+ event.script = script;
+ event.tick = tick;
+ model.events.add(event);
+ }
+ }
+
+ return toDocument(model);
+ }
+
+ /**
+ * Creates a resource document with unsorted resources.
+ *
+ * Resources maintain their natural iteration order. Filters resources to only include those
+ * belonging to the specified mod.
+ *
+ *
Use this for: factions, recipes, terrain, themes (resources where order doesn't matter).
+ *
+ * @param resources the collection of resources to serialize
+ * @param rootName the XML root element name (e.g., "factions", "terrain")
+ * @param mod the active mod (filters by mod ID)
+ * @return JDOM Document with unsorted resources
+ */
+ public Document getListDoc(Collection resources, String rootName, RMod mod) {
+ return buildResourceDoc(resources, rootName, mod, false);
+ }
+
+ /**
+ * Creates a resource document with resources sorted alphabetically by ID.
+ *
+ *
Resources are sorted alphabetically by their {@code id} field. Filters resources to only
+ * include those belonging to the specified mod.
+ *
+ *
Use this for: items, creatures, spells (resources that benefit from alphabetical order).
+ *
+ * @param resources the collection of resources to serialize
+ * @param rootName the XML root element name (e.g., "items", "monsters")
+ * @param mod the active mod (filters by mod ID)
+ * @return JDOM Document with sorted resources
+ */
+ public Document getResourceDoc(Collection resources, String rootName, RMod mod) {
+ return buildResourceDoc(resources, rootName, mod, true);
+ }
+
+ /**
+ * Builds a resource document, filtering by mod and optionally sorting by ID.
+ *
+ *
This method uses each resource's {@code toElement()} method to serialize individual
+ * resources. Many resources (RCreature, RSpell, etc.) internally use Jackson in their {@code
+ * toElement()} implementation, following the established bridge pattern.
+ *
+ * @param resources the collection of resources
+ * @param rootName the XML root element name
+ * @param mod the active mod
+ * @param sorted whether to sort resources alphabetically by ID
+ * @return JDOM Document
+ */
+ private Document buildResourceDoc(
+ Collection resources, String rootName, RMod mod, boolean sorted) {
+
+ // Filter resources belonging to this mod
+ List filtered =
+ resources.stream()
+ .filter(r -> r.getPath()[0].equals(mod.get("id")))
+ .collect(Collectors.toList());
+
+ // Sort if requested
+ if (sorted) {
+ filtered.sort(Comparator.comparing(r -> r.id));
+ }
+
+ // Build JDOM element with children using toElement() bridge
+ Element root = new Element(rootName);
+ for (RData resource : filtered) {
+ root.addContent(resource.toElement());
+ }
+
+ return new Document(root);
+ }
+
+ /**
+ * Converts a Jackson model to a JDOM Document using the Jackson→JDOM bridge pattern.
+ *
+ * This follows the same pattern as {@code RSpell.toElement()} (line 384-398) and {@code
+ * RMod.getMainElement()} (line 179-203): serialize to XML via Jackson, then parse back to JDOM.
+ *
+ *
This bridge is temporary and will be removed in Phase 7B when {@code ModFiler} is updated to
+ * save ByteArrayOutputStream directly.
+ *
+ * @param model the Jackson-annotated model object to serialize
+ * @return JDOM Document
+ */
+ private Document toDocument(Object model) {
+ try {
+ // Serialize model to XML using Jackson
+ String xml = mapper.toXml(model).toString();
+
+ // Parse XML string back to JDOM Document
+ return new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes()));
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to convert Jackson model to JDOM Document", e);
+ }
+ }
+
+ /**
+ * Jackson model for events.xml structure.
+ *
+ *
Represents the XML structure:
+ *
+ *
{@code
+ *
+ *
+ * ...
+ *
+ * }
+ */
+ @JacksonXmlRootElement(localName = "events")
+ static class EventsModel {
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "event")
+ public List events;
+
+ /** Represents a single scheduled event. */
+ static class Event {
+ @JacksonXmlProperty(isAttribute = true)
+ public String script;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public String tick;
+ }
+ }
+}
diff --git a/src/main/java/neon/editor/ModFiler.java b/src/main/java/neon/editor/ModFiler.java
index ca676c1..e99ee1e 100644
--- a/src/main/java/neon/editor/ModFiler.java
+++ b/src/main/java/neon/editor/ModFiler.java
@@ -1,245 +1,274 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2013 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.editor;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import neon.editor.resources.*;
-import neon.resources.RCraft;
-import neon.resources.RCreature;
-import neon.resources.RDungeonTheme;
-import neon.resources.RItem;
-import neon.resources.RMod;
-import neon.resources.RPerson;
-import neon.resources.RRecipe;
-import neon.resources.RRegionTheme;
-import neon.resources.RScript;
-import neon.resources.RSign;
-import neon.resources.RSpell;
-import neon.resources.RTattoo;
-import neon.resources.RTerrain;
-import neon.resources.RZoneTheme;
-import neon.resources.quest.RQuest;
-import neon.systems.files.FileSystem;
-import neon.systems.files.StringTranslator;
-import neon.systems.files.XMLTranslator;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.JDOMException;
-import org.jdom2.input.SAXBuilder;
-
-public class ModFiler {
- private FileSystem files;
- private DataStore store;
- private Editor editor;
- private JFrame frame;
-
- public ModFiler(JFrame frame, FileSystem files, DataStore store, Editor editor) {
- this.frame = frame;
- this.files = files;
- this.store = store;
- this.editor = editor;
- }
-
- void loadMod() {
- // hacky way to make the filechooser start in the game dir
- JFileChooser chooser = new JFileChooser(new File("neon.ini.xml"));
- chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
- chooser.setDialogTitle("Choose module");
- if (chooser.showOpenDialog(frame) == JFileChooser.APPROVE_OPTION) {
- load(chooser.getSelectedFile(), true);
- }
- }
-
- void load(File file, boolean active) {
- String path = file.getPath();
- try {
- path = files.mount(path);
- if (!isMod(path)) { // check if this is a mod
- JOptionPane.showMessageDialog(frame, "Selected file is not a valid mod.");
- files.removePath(path);
- } else {
- if (isExtension(path)) { // if extension: load all masters
- Document doc = files.getFile(new XMLTranslator(), path, "main.xml");
- for (Object master : doc.getRootElement().getChildren("master")) {
- String id = ((Element) master).getText();
- Document ini = new Document();
- try { // check in neon.ini.xml which mods exist
- FileInputStream in = new FileInputStream("neon.ini.xml");
- ini = new SAXBuilder().build(in);
- in.close();
- } catch (JDOMException e) {
- }
-
- // check if there is a mod with the correct id
- for (Element mod : ini.getRootElement().getChild("files").getChildren()) {
- if (!mod.getText().equals(path)) { // make sure current mod is not loaded again
- System.out.println(mod.getText() + ", " + path);
- files.mount(mod.getText());
- Document d = files.getFile(new XMLTranslator(), mod.getText(), "main.xml");
- if (d.getRootElement().getAttributeValue("id").equals(id)) {
- store.loadData(mod.getText(), false, false);
- } else {
- files.removePath(mod.getText());
- }
- }
- }
- }
- }
-
- frame.setTitle("Neon Editor: " + path);
- store.loadData(path, active, isExtension(path));
- editor.mapEditor.loadMaps(Editor.resources.getResources(RMap.class), path);
- editor.enableEditing(file.isDirectory());
- frame.pack();
- }
- } catch (IOException e1) {
- JOptionPane.showMessageDialog(frame, "Selected file is not a valid mod.");
- }
- }
-
- public void save() {
- XMLBuilder builder = new XMLBuilder(store);
- RMod active = store.getActive();
- saveFile(new Document(store.getActive().getMainElement()), "main.xml");
- saveFile(new Document(store.getActive().getCCElement()), "cc.xml");
- saveFile(
- builder.getResourceDoc(Editor.resources.getResources(RItem.class), "items", active),
- "objects",
- "items.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RFaction.class), "factions", active),
- "factions.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RRecipe.class), "recipes", active),
- "objects",
- "alchemy.xml");
- saveFile(builder.getEventsDoc(), "events.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RPerson.class), "people", active),
- "objects",
- "npc.xml");
- saveFile(
- builder.getResourceDoc(Editor.resources.getResources(RCreature.class), "monsters", active),
- "objects",
- "monsters.xml");
- saveFile(
- builder.getResourceDoc(Editor.resources.getResources(RSpell.class), "spells", active),
- "spells.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RTerrain.class), "terrain", active),
- "terrain.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RCraft.class), "items", active),
- "objects",
- "crafting.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RSign.class), "signs", active),
- "signs.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RTattoo.class), "tattoos", active),
- "tattoos.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RZoneTheme.class), "themes", active),
- "themes",
- "zones.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RDungeonTheme.class), "themes", active),
- "themes",
- "dungeons.xml");
- saveFile(
- builder.getListDoc(Editor.resources.getResources(RRegionTheme.class), "themes", active),
- "themes",
- "regions.xml");
- saveMaps();
- saveQuests();
- saveScripts();
- }
-
- private void saveMaps() {
- for (String name : files.listFiles(store.getActive().getPath()[0], "maps")) {
- String map =
- name.substring(name.lastIndexOf(File.separator) + 1, name.length() - 4); // -4 for ".xml"
- if (Editor.resources.getResource(map, "maps") == null) {
- files.delete(name);
- }
- }
- for (RMap map : editor.mapEditor.getActiveMaps()) {
- Document doc = new Document().setRootElement(map.toElement());
- saveFile(doc, "maps", map.id + ".xml");
- }
- }
-
- private void saveQuests() {
- for (String name : files.listFiles(store.getActive().getPath()[0], "quests")) {
- String quest =
- name.substring(name.lastIndexOf(File.separator) + 1, name.length() - 4); // -4 for ".xml"
- if (Editor.resources.getResource(quest, "quest") == null) {
- files.delete(name);
- }
- }
- for (RQuest quest : Editor.resources.getResources(RQuest.class)) {
- saveFile(new Document(quest.toElement()), "quests", quest.id + ".xml");
- }
- }
-
- private void saveScripts() {
- for (String name : files.listFiles(store.getActive().getPath()[0], "scripts")) {
- String script =
- name.substring(name.lastIndexOf(File.separator) + 1, name.length() - 3); // -3 for ".js"
- if (!store.getScripts().containsKey(script)) {
- files.delete(name);
- }
- }
- for (RScript script : store.getScripts().values()) {
- saveFile(script.script, "scripts", script.id + ".js");
- }
- }
-
- private void saveFile(String text, String... file) {
- String[] fullPath = new String[file.length + 1];
- System.arraycopy(file, 0, fullPath, 1, file.length);
- fullPath[0] = store.getActive().getPath()[0];
- files.saveFile(text, new StringTranslator(), fullPath);
- }
-
- private void saveFile(Document doc, String... file) {
- String[] fullPath = new String[file.length + 1];
- System.arraycopy(file, 0, fullPath, 1, file.length);
- fullPath[0] = store.getActive().getPath()[0];
- files.saveFile(doc, new XMLTranslator(), fullPath);
- }
-
- private boolean isExtension(String path) {
- Document doc = files.getFile(new XMLTranslator(), path, "main.xml");
- return doc.getRootElement().getName().equals("extension");
- }
-
- private boolean isMod(String path) {
- try { // main.xml must exist and be valid xml
- return files.getFile(new XMLTranslator(), path, "main.xml") != null;
- } catch (NullPointerException e) {
- return false;
- }
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2013 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.editor;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import neon.editor.resources.*;
+import neon.maps.model.DungeonModel;
+import neon.maps.model.WorldModel;
+import neon.resources.RCraft;
+import neon.resources.RCreature;
+import neon.resources.RDungeonTheme;
+import neon.resources.RItem;
+import neon.resources.RMod;
+import neon.resources.RPerson;
+import neon.resources.RRecipe;
+import neon.resources.RRegionTheme;
+import neon.resources.RScript;
+import neon.resources.RSign;
+import neon.resources.RSpell;
+import neon.resources.RTattoo;
+import neon.resources.RTerrain;
+import neon.resources.RZoneTheme;
+import neon.resources.quest.RQuest;
+import neon.systems.files.FileSystem;
+import neon.systems.files.JacksonMapper;
+import neon.systems.files.StringTranslator;
+import neon.systems.files.XMLTranslator;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+
+public class ModFiler {
+ private FileSystem files;
+ private DataStore store;
+ private Editor editor;
+ private JFrame frame;
+
+ public ModFiler(JFrame frame, FileSystem files, DataStore store, Editor editor) {
+ this.frame = frame;
+ this.files = files;
+ this.store = store;
+ this.editor = editor;
+ }
+
+ void loadMod() {
+ // hacky way to make the filechooser start in the game dir
+ JFileChooser chooser = new JFileChooser(new File("neon.ini.xml"));
+ chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+ chooser.setDialogTitle("Choose module");
+ if (chooser.showOpenDialog(frame) == JFileChooser.APPROVE_OPTION) {
+ load(chooser.getSelectedFile(), true);
+ }
+ }
+
+ void load(File file, boolean active) {
+ String path = file.getPath();
+ try {
+ path = files.mount(path);
+ if (!isMod(path)) { // check if this is a mod
+ JOptionPane.showMessageDialog(frame, "Selected file is not a valid mod.");
+ files.removePath(path);
+ } else {
+ if (isExtension(path)) { // if extension: load all masters
+ Document doc = files.getFile(new XMLTranslator(), path, "main.xml");
+ for (Object master : doc.getRootElement().getChildren("master")) {
+ String id = ((Element) master).getText();
+ Document ini = new Document();
+ try { // check in neon.ini.xml which mods exist
+ FileInputStream in = new FileInputStream("neon.ini.xml");
+ ini = new SAXBuilder().build(in);
+ in.close();
+ } catch (JDOMException e) {
+ }
+
+ // check if there is a mod with the correct id
+ for (Element mod : ini.getRootElement().getChild("files").getChildren()) {
+ if (!mod.getText().equals(path)) { // make sure current mod is not loaded again
+ System.out.println(mod.getText() + ", " + path);
+ files.mount(mod.getText());
+ Document d = files.getFile(new XMLTranslator(), mod.getText(), "main.xml");
+ if (d.getRootElement().getAttributeValue("id").equals(id)) {
+ store.loadData(mod.getText(), false, false);
+ } else {
+ files.removePath(mod.getText());
+ }
+ }
+ }
+ }
+ }
+
+ frame.setTitle("Neon Editor: " + path);
+ store.loadData(path, active, isExtension(path));
+ editor.mapEditor.loadMaps(Editor.resources.getResources(RMap.class), path);
+ editor.enableEditing(file.isDirectory());
+ frame.pack();
+ }
+ } catch (IOException e1) {
+ JOptionPane.showMessageDialog(frame, "Selected file is not a valid mod.");
+ }
+ }
+
+ public void save() {
+ JacksonXmlBuilder builder = new JacksonXmlBuilder(store);
+ RMod active = store.getActive();
+ saveFile(new Document(store.getActive().getMainElement()), "main.xml");
+ saveFile(new Document(store.getActive().getCCElement()), "cc.xml");
+ saveFile(
+ builder.getResourceDoc(Editor.resources.getResources(RItem.class), "items", active),
+ "objects",
+ "items.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RFaction.class), "factions", active),
+ "factions.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RRecipe.class), "recipes", active),
+ "objects",
+ "alchemy.xml");
+ saveFile(builder.getEventsDoc(), "events.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RPerson.class), "people", active),
+ "objects",
+ "npc.xml");
+ saveFile(
+ builder.getResourceDoc(Editor.resources.getResources(RCreature.class), "monsters", active),
+ "objects",
+ "monsters.xml");
+ saveFile(
+ builder.getResourceDoc(Editor.resources.getResources(RSpell.class), "spells", active),
+ "spells.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RTerrain.class), "terrain", active),
+ "terrain.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RCraft.class), "items", active),
+ "objects",
+ "crafting.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RSign.class), "signs", active),
+ "signs.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RTattoo.class), "tattoos", active),
+ "tattoos.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RZoneTheme.class), "themes", active),
+ "themes",
+ "zones.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RDungeonTheme.class), "themes", active),
+ "themes",
+ "dungeons.xml");
+ saveFile(
+ builder.getListDoc(Editor.resources.getResources(RRegionTheme.class), "themes", active),
+ "themes",
+ "regions.xml");
+ saveMaps();
+ saveQuests();
+ saveScripts();
+ }
+
+ /**
+ * Saves all maps using Jackson XML serialization.
+ *
+ * NOTE (Phase 6 - Partial Migration): Maps use Jackson via toWorldModel()/toDungeonModel()
+ * (migrated in Phase 2D). Other resources still use toElement() bridge and XMLTranslator. Full
+ * migration of resource saving to Jackson deferred to Phase 7.
+ */
+ private void saveMaps() {
+ // Delete maps that no longer exist
+ for (String name : files.listFiles(store.getActive().getPath()[0], "maps")) {
+ String map =
+ name.substring(name.lastIndexOf(File.separator) + 1, name.length() - 4); // -4 for ".xml"
+ if (Editor.resources.getResource(map, "maps") == null) {
+ files.delete(name);
+ }
+ }
+
+ // Save maps using Jackson serialization
+ JacksonMapper mapper = new JacksonMapper();
+ for (RMap map : editor.mapEditor.getActiveMaps()) {
+ try {
+ ByteArrayOutputStream out;
+ if (map.isDungeon()) {
+ DungeonModel model = map.toDungeonModel();
+ out = mapper.toXml(model);
+ } else {
+ WorldModel model = map.toWorldModel();
+ out = mapper.toXml(model);
+ }
+ // Convert ByteArrayOutputStream to String for saveFile
+ String xml = out.toString("UTF-8");
+ saveFile(xml, "maps", map.id + ".xml");
+ } catch (Exception e) {
+ System.err.println("Failed to save map: " + map.id);
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private void saveQuests() {
+ for (String name : files.listFiles(store.getActive().getPath()[0], "quests")) {
+ String quest =
+ name.substring(name.lastIndexOf(File.separator) + 1, name.length() - 4); // -4 for ".xml"
+ if (Editor.resources.getResource(quest, "quest") == null) {
+ files.delete(name);
+ }
+ }
+ for (RQuest quest : Editor.resources.getResources(RQuest.class)) {
+ saveFile(new Document(quest.toElement()), "quests", quest.id + ".xml");
+ }
+ }
+
+ private void saveScripts() {
+ for (String name : files.listFiles(store.getActive().getPath()[0], "scripts")) {
+ String script =
+ name.substring(name.lastIndexOf(File.separator) + 1, name.length() - 3); // -3 for ".js"
+ if (!store.getScripts().containsKey(script)) {
+ files.delete(name);
+ }
+ }
+ for (RScript script : store.getScripts().values()) {
+ saveFile(script.script, "scripts", script.id + ".js");
+ }
+ }
+
+ private void saveFile(String text, String... file) {
+ String[] fullPath = new String[file.length + 1];
+ System.arraycopy(file, 0, fullPath, 1, file.length);
+ fullPath[0] = store.getActive().getPath()[0];
+ files.saveFile(text, new StringTranslator(), fullPath);
+ }
+
+ private void saveFile(Document doc, String... file) {
+ String[] fullPath = new String[file.length + 1];
+ System.arraycopy(file, 0, fullPath, 1, file.length);
+ fullPath[0] = store.getActive().getPath()[0];
+ files.saveFile(doc, new XMLTranslator(), fullPath);
+ }
+
+ private boolean isExtension(String path) {
+ Document doc = files.getFile(new XMLTranslator(), path, "main.xml");
+ return doc.getRootElement().getName().equals("extension");
+ }
+
+ private boolean isMod(String path) {
+ try { // main.xml must exist and be valid xml
+ return files.getFile(new XMLTranslator(), path, "main.xml") != null;
+ } catch (NullPointerException e) {
+ return false;
+ }
+ }
+}
diff --git a/src/main/java/neon/editor/XMLBuilder.java b/src/main/java/neon/editor/XMLBuilder.java
index b7ad47d..3f61c13 100644
--- a/src/main/java/neon/editor/XMLBuilder.java
+++ b/src/main/java/neon/editor/XMLBuilder.java
@@ -25,6 +25,14 @@
import org.jdom2.Document;
import org.jdom2.Element;
+/**
+ * Builds JDOM Documents for editor save operations using JDOM construction.
+ *
+ * @deprecated Replaced by {@link JacksonXmlBuilder} in Phase 7A. Use JacksonXmlBuilder for all new
+ * code. This class will be removed in Phase 7B when toElement() methods are eliminated from
+ * resources.
+ */
+@Deprecated(forRemoval = true)
public class XMLBuilder {
private DataStore store;
diff --git a/src/main/java/neon/editor/editors/NPCEditor.java b/src/main/java/neon/editor/editors/NPCEditor.java
index d755cb2..67ee012 100644
--- a/src/main/java/neon/editor/editors/NPCEditor.java
+++ b/src/main/java/neon/editor/editors/NPCEditor.java
@@ -1,667 +1,689 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2013 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.editor.editors;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.text.NumberFormat;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
-import neon.editor.*;
-import neon.editor.help.HelpLabels;
-import neon.editor.resources.RFaction;
-import neon.entities.property.Skill;
-import neon.resources.*;
-import neon.resources.RSpell.SpellType;
-import org.jdom2.Element;
-
-public class NPCEditor extends ObjectEditor implements MouseListener {
- private RPerson data;
- private JList spellList, itemList, destList;
- private JTextField nameField;
- private JComboBox factionBox;
- private JComboBox raceBox;
- private JComboBox aiTypeBox;
- private JSpinner aggressionSpinner, confidenceSpinner, factionSpinner;
- private JFormattedTextField rangeField, destX, destY, destCost, skillField;
- private HashMap skills;
- private Set trainedSkills;
- private HashMap joinedFactions;
- private HashMap destMap;
- private JCheckBox spellBox,
- skillBox,
- tradeBox,
- travelBox,
- trainBox,
- spellMakerBox,
- factionCheckBox,
- potionBox,
- healerBox,
- tattooBox;
- private JComboBox skillComboBox;
- private DefaultListModel destListModel, spellListModel, itemListModel;
- private Skill currentSkill;
- private Element currentDest;
- private ArrayList spells;
-
- public NPCEditor(JFrame parent, RPerson data) {
- super(parent, "NPC Editor: " + data.id);
- this.data = data;
-
- spells = new ArrayList();
- for (RSpell spell : Editor.resources.getResources(RSpell.class)) {
- if (spell.type == SpellType.SPELL) {
- spells.add(spell.id);
- }
- }
-
- JPanel npcProps = new JPanel();
- npcProps.setBorder(new TitledBorder("Properties"));
- BoxLayout propLayout = new BoxLayout(npcProps, BoxLayout.PAGE_AXIS);
- npcProps.setLayout(propLayout);
-
- JPanel generalPanel = new JPanel();
- generalPanel.setBorder(new TitledBorder("General"));
- nameField = new JTextField(10);
- raceBox = new JComboBox(Editor.resources.getResources(RCreature.class));
- generalPanel.add(new JLabel("Name: "));
- generalPanel.add(nameField);
- generalPanel.add(new JLabel(" "));
- generalPanel.add(HelpLabels.getNameHelpLabel());
- generalPanel.add(new JLabel(" "));
- generalPanel.add(new JLabel("Species: "));
- generalPanel.add(raceBox);
- generalPanel.add(new JLabel(" "));
- generalPanel.add(HelpLabels.getRaceHelpLabel());
- generalPanel.setMaximumSize(
- new Dimension(generalPanel.getMaximumSize().width, generalPanel.getPreferredSize().height));
-
- JPanel aiPanel = new JPanel();
- GroupLayout layout = new GroupLayout(aiPanel);
- aiPanel.setLayout(layout);
- layout.setAutoCreateGaps(true);
- JLabel aiTypeLabel = new JLabel("Type: ");
- JLabel aggressionLabel = new JLabel("Aggression: ");
- JLabel confidenceLabel = new JLabel("Confidence: ");
- JLabel rangeLabel = new JLabel("Territory: ");
- aiTypeBox = new JComboBox(RCreature.AIType.values());
- aggressionSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 100, 1));
- confidenceSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 100, 1));
- rangeField = new JFormattedTextField(NumberFormat.getIntegerInstance());
- rangeField.setValue(0);
- JLabel aiHelpLabel = HelpLabels.getAITypeHelpLabel();
- JLabel confidenceHelpLabel = HelpLabels.getConfidenceHelpLabel();
- JLabel aggressionHelpLabel = HelpLabels.getAggressionHelpLabel();
- JLabel rangeHelpLabel = HelpLabels.getRangeHelpLabel();
- aiPanel.setMaximumSize(
- new Dimension(generalPanel.getMaximumSize().width, generalPanel.getPreferredSize().height));
- layout.setVerticalGroup(
- layout
- .createSequentialGroup()
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.BASELINE)
- .addComponent(aiTypeLabel)
- .addComponent(aiTypeBox)
- .addComponent(aiHelpLabel)
- .addComponent(aggressionLabel)
- .addComponent(aggressionSpinner)
- .addComponent(aggressionHelpLabel))
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.BASELINE)
- .addComponent(confidenceLabel)
- .addComponent(confidenceSpinner)
- .addComponent(confidenceHelpLabel)
- .addComponent(rangeLabel)
- .addComponent(rangeField)
- .addComponent(rangeHelpLabel)));
- layout.setHorizontalGroup(
- layout
- .createSequentialGroup()
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(
- aiTypeLabel,
- GroupLayout.PREFERRED_SIZE,
- GroupLayout.DEFAULT_SIZE,
- GroupLayout.PREFERRED_SIZE)
- .addComponent(confidenceLabel))
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING, false)
- .addComponent(
- aiTypeBox,
- GroupLayout.PREFERRED_SIZE,
- GroupLayout.DEFAULT_SIZE,
- GroupLayout.PREFERRED_SIZE)
- .addComponent(confidenceSpinner))
- .addGap(10)
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(aiHelpLabel)
- .addComponent(confidenceHelpLabel))
- .addGap(10)
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(
- aggressionLabel,
- GroupLayout.PREFERRED_SIZE,
- GroupLayout.DEFAULT_SIZE,
- GroupLayout.PREFERRED_SIZE)
- .addComponent(rangeLabel))
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING, false)
- .addComponent(
- aggressionSpinner,
- GroupLayout.PREFERRED_SIZE,
- GroupLayout.DEFAULT_SIZE,
- GroupLayout.PREFERRED_SIZE)
- .addComponent(rangeField))
- .addGap(10)
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(aggressionHelpLabel)
- .addComponent(rangeHelpLabel)));
- aiPanel.setBorder(new TitledBorder("AI"));
-
- JTabbedPane servicePane = new JTabbedPane();
- servicePane.setBorder(new TitledBorder("Services"));
-
- JPanel spellPanel = new JPanel(new BorderLayout());
- spellBox = new JCheckBox("Spell trader");
- spellMakerBox = new JCheckBox("Spell maker");
- healerBox = new JCheckBox("Healer");
- JPanel spellBoxPanel = new JPanel();
- spellBoxPanel.add(spellBox, BorderLayout.PAGE_START);
- spellBoxPanel.add(spellMakerBox, BorderLayout.CENTER);
- spellBoxPanel.add(healerBox, BorderLayout.PAGE_END);
- spellPanel.add(spellBoxPanel, BorderLayout.PAGE_START);
- spellListModel = new DefaultListModel();
- spellList = new JList(spellListModel);
- spellList.addMouseListener(this);
- JScrollPane spellScroller = new JScrollPane(spellList);
- spellPanel.add(spellScroller, BorderLayout.CENTER);
- servicePane.add(spellPanel, "Magic");
-
- JPanel tradePanel = new JPanel(new BorderLayout());
- tradeBox = new JCheckBox("Trader");
- tradeBox.setHorizontalAlignment(SwingConstants.CENTER);
- tradePanel.add(tradeBox, BorderLayout.PAGE_START);
- itemListModel = new DefaultListModel();
- itemList = new JList(itemListModel);
- itemList.addMouseListener(this);
- JScrollPane itemScroller = new JScrollPane(itemList);
- tradePanel.add(itemScroller, BorderLayout.CENTER);
- servicePane.add(tradePanel, "Trade");
-
- JPanel skillPanel = new JPanel(new BorderLayout());
- skills = new HashMap();
- trainedSkills = new HashSet();
- trainBox = new JCheckBox("Skill trainer");
- trainBox.setHorizontalAlignment(SwingConstants.CENTER);
- skillPanel.add(trainBox, BorderLayout.PAGE_START);
- JPanel skillSubPanel = new JPanel();
- skillSubPanel.add(new JLabel("Skills: "));
- skillComboBox = new JComboBox(Skill.values());
- skillComboBox.addActionListener(new SkillListListener());
- skillSubPanel.add(skillComboBox);
- skillField = new JFormattedTextField(NumberFormat.getIntegerInstance());
- skillField.setColumns(3);
- skillSubPanel.add(skillField);
- skillBox = new JCheckBox("Trainable?");
- skillSubPanel.add(skillBox);
- skillPanel.add(skillSubPanel);
- servicePane.add(skillPanel, "Training");
-
- JPanel travelPanel = new JPanel(new BorderLayout());
- destMap = new HashMap();
- travelBox = new JCheckBox("Travel agent");
- travelBox.setHorizontalAlignment(SwingConstants.CENTER);
- travelPanel.add(travelBox, BorderLayout.PAGE_START);
- destListModel = new DefaultListModel();
- destList = new JList(destListModel);
- destList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- destList.addMouseListener(this);
- destList.addListSelectionListener(new DestListAction());
- JScrollPane destScroller = new JScrollPane(destList);
- travelPanel.add(destScroller, BorderLayout.CENTER);
- JPanel destPanel = new JPanel();
- destPanel.add(new JLabel("x: "));
- destX = new JFormattedTextField(NumberFormat.getIntegerInstance());
- destX.setColumns(5);
- destPanel.add(destX);
- destPanel.add(new JLabel("y: "));
- destY = new JFormattedTextField(NumberFormat.getIntegerInstance());
- destY.setColumns(5);
- destPanel.add(destY);
- destPanel.add(new JLabel("price: "));
- destCost = new JFormattedTextField(NumberFormat.getIntegerInstance());
- destCost.setColumns(5);
- destPanel.add(destCost);
- travelPanel.add(destPanel, BorderLayout.PAGE_END);
- servicePane.add(travelPanel, "Travel");
-
- JPanel otherPanel = new JPanel();
- potionBox = new JCheckBox("Potion maker");
- otherPanel.add(potionBox);
- tattooBox = new JCheckBox("Tattoo artist");
- otherPanel.add(tattooBox);
- servicePane.add(otherPanel, "Other");
-
- // factions
- JPanel factionPanel = new JPanel();
-
- joinedFactions = new HashMap();
- FactionListListener fl = new FactionListListener();
-
- factionBox = new JComboBox(Editor.resources.getResources(RFaction.class));
- factionBox.addActionListener(fl);
- factionPanel.add(factionBox);
- factionCheckBox = new JCheckBox();
- factionCheckBox.addItemListener(fl);
- factionPanel.add(factionCheckBox);
- factionSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 100, 1));
- factionSpinner.addChangeListener(fl);
- factionPanel.add(factionSpinner);
- factionPanel.add(new JLabel(" "));
- factionPanel.add(HelpLabels.getFactionHelpLabel());
- factionPanel.setBorder(new TitledBorder("Factions"));
-
- npcProps.add(generalPanel);
- npcProps.add(aiPanel);
- npcProps.add(factionPanel);
- npcProps.add(servicePane);
-
- frame.add(new JScrollPane(npcProps), BorderLayout.CENTER);
- }
-
- protected void load() {
- nameField.setText(data.name);
- RCreature species = (RCreature) Editor.resources.getResource(data.species);
- raceBox.setSelectedItem(species);
-
- for (String s : data.factions.keySet()) {
- joinedFactions.put(s, data.factions.get(s));
- }
- factionCheckBox.setSelected(joinedFactions.containsKey(factionBox.getSelectedItem()));
- if (joinedFactions.containsKey(factionBox.getSelectedItem())) {
- factionSpinner.setValue(data.factions.get(factionBox.getSelectedItem()));
- factionSpinner.setEnabled(true);
- } else {
- factionSpinner.setEnabled(false);
- factionSpinner.setValue(0);
- }
-
- if (data.aiType != null) {
- aiTypeBox.setSelectedItem(data.aiType);
- } else if (species != null) {
- aiTypeBox.setSelectedItem(species.aiType);
- }
- if (data.aiRange > -1) {
- rangeField.setValue(data.aiRange);
- } else if (species != null) {
- rangeField.setValue(species.aiRange);
- }
- if (data.aiAggr > -1) {
- aggressionSpinner.setValue(data.aiAggr);
- } else if (species != null) {
- rangeField.setValue(species.aiAggr);
- }
- if (data.aiConf > -1) {
- confidenceSpinner.setValue(data.aiConf);
- } else if (species != null) {
- rangeField.setValue(species.aiConf);
- }
-
- skills = data.skills;
- if (skills.containsKey(skillComboBox.getSelectedItem())) {
- skillField.setValue(skills.get(skillComboBox.getSelectedItem()));
- } else {
- skillField.setValue(0);
- }
-
- for (String rs : data.spells) {
- spellListModel.addElement(rs);
- }
-
- for (String i : data.items) {
- itemListModel.addElement(i);
- }
-
- for (Element service : data.services) {
- if (service.getAttributeValue("id").equals("trade")) {
- tradeBox.setSelected(true);
- } else if (service.getAttributeValue("id").equals("travel")) {
- travelBox.setSelected(true);
- for (Element d : service.getChildren()) {
- destListModel.addElement(d.getAttributeValue("name"));
- destMap.put(d.getAttributeValue("name"), d);
- }
- } else if (service.getAttributeValue("id").equals("training")) {
- trainBox.setSelected(true);
- for (Element s : service.getChildren()) {
- trainedSkills.add(Skill.valueOf(s.getText().toUpperCase()));
- }
- skillBox.setSelected(trainedSkills.contains(skillComboBox.getSelectedItem()));
- } else if (service.getAttributeValue("id").equals("spells")) {
- spellBox.setSelected(true);
- } else if (service.getAttributeValue("id").equals("spellmaker")) {
- spellMakerBox.setSelected(true);
- } else if (service.getAttributeValue("id").equals("healer")) {
- healerBox.setSelected(true);
- } else if (service.getAttributeValue("id").equals("alchemy")) {
- potionBox.setSelected(true);
- } else if (service.getAttributeValue("id").equals("tattoo")) {
- tattooBox.setSelected(true);
- }
- }
- }
-
- public void mouseExited(MouseEvent e) {}
-
- public void mouseEntered(MouseEvent e) {}
-
- public void mouseReleased(MouseEvent e) {}
-
- public void mousePressed(MouseEvent e) {}
-
- public void mouseClicked(MouseEvent e) {
- if (e.getButton() == MouseEvent.BUTTON3) {
- if (e.getComponent() == itemList) {
- JPopupMenu menu = new JPopupMenu();
- menu.add(new ItemListAction("Add item"));
- menu.add(new ItemListAction("Delete item"));
- menu.show(e.getComponent(), e.getX(), e.getY());
- itemList.setSelectedIndex(itemList.locationToIndex(e.getPoint()));
- } else if (e.getComponent() == spellList) {
- JPopupMenu menu = new JPopupMenu();
- menu.add(new SpellListAction("Add spell"));
- menu.add(new SpellListAction("Delete spell"));
- menu.show(e.getComponent(), e.getX(), e.getY());
- spellList.setSelectedIndex(spellList.locationToIndex(e.getPoint()));
- } else if (e.getComponent() == destList) {
- JPopupMenu menu = new JPopupMenu();
- menu.add(new DestListAction("Add destination"));
- menu.add(new DestListAction("Delete destination"));
- menu.show(e.getComponent(), e.getX(), e.getY());
- destList.setSelectedIndex(destList.locationToIndex(e.getPoint()));
- }
- }
- }
-
- protected void save() {
- data.name = nameField.getText();
- RCreature species = raceBox.getItemAt(raceBox.getSelectedIndex());
- data.species = species.id;
-
- if (species.aiType.equals(aiTypeBox.getItemAt(aiTypeBox.getSelectedIndex()))) {
- data.aiType = null;
- } else {
- data.aiType = aiTypeBox.getItemAt(aiTypeBox.getSelectedIndex());
- }
- if (species.aiRange == (Integer) rangeField.getValue()) {
- data.aiRange = -1;
- } else {
- data.aiRange = (Integer) rangeField.getValue();
- }
- if (species.aiAggr == (Integer) aggressionSpinner.getValue()) {
- data.aiAggr = -1;
- } else {
- data.aiAggr = (Integer) aggressionSpinner.getValue();
- }
- if (species.aiConf == (Integer) confidenceSpinner.getValue()) {
- data.aiConf = -1;
- } else {
- data.aiConf = (Integer) confidenceSpinner.getValue();
- }
-
- data.factions.clear();
- for (String f : joinedFactions.keySet()) {
- data.factions.put(f, joinedFactions.get(f));
- }
-
- data.services.clear();
- if (tradeBox.isSelected()) {
- data.services.add(new Element("service").setAttribute("id", "trade"));
- }
- data.items.clear();
- for (Enumeration e = itemListModel.elements(); e.hasMoreElements(); ) {
- data.items.add(e.nextElement());
- }
-
- if (spellMakerBox.isSelected()) {
- data.services.add(new Element("service").setAttribute("id", "spellmaker"));
- }
- if (healerBox.isSelected()) {
- data.services.add(new Element("service").setAttribute("id", "healer"));
- }
- if (spellBox.isSelected()) {
- data.services.add(new Element("service").setAttribute("id", "spells"));
- }
- for (Enumeration e = spellListModel.elements(); e.hasMoreElements(); ) {
- data.spells.add(e.nextElement());
- }
-
- if (trainBox.isSelected()) {
- Element training = new Element("service");
- training.setAttribute("id", "training");
- data.services.add(training);
- for (Skill s : trainedSkills) {
- training.addContent(new Element("skill").setText(s.toString()));
- }
- }
- data.skills.clear();
- for (Skill s : skills.keySet()) {
- if (skills.get(s) != null && !skills.get(s).equals(0)) {
- skills.put(s, skills.get(s));
- }
- }
-
- if (travelBox.isSelected()) {
- Element travel = new Element("service");
- travel.setAttribute("id", "travel");
- // a bit of magic to still get the last modified value into destMap
- if (currentDest != null) {
- currentDest.setAttribute("x", destX.getValue().toString());
- currentDest.setAttribute("y", destY.getValue().toString());
- currentDest.setAttribute("cost", destCost.getValue().toString());
- }
- // magic done
- for (Element d : destMap.values()) {
- d.detach();
- travel.addContent(d);
- }
- data.services.add(travel);
- }
-
- if (potionBox.isSelected()) {
- data.services.add(new Element("service").setAttribute("id", "alchemy"));
- }
-
- if (tattooBox.isSelected()) {
- data.services.add(new Element("service").setAttribute("id", "tattoo"));
- }
-
- data.setPath(Editor.getStore().getActive().get("id"));
- }
-
- private class SkillListListener implements ActionListener {
- public void actionPerformed(ActionEvent e) {
- try {
- skills.put(currentSkill, Integer.parseInt(skillField.getText()));
- } catch (NumberFormatException f) {
- }
- if (skillBox.isSelected()) {
- trainedSkills.add(currentSkill);
- } else {
- trainedSkills.remove(currentSkill);
- }
-
- Skill skill = (Skill) skillComboBox.getSelectedItem();
- if (skills.containsKey(skill)) {
- skillField.setText(skills.get(skill).toString());
- } else {
- skillField.setText("0");
- }
- skillBox.setSelected(trainedSkills.contains(skill));
- currentSkill = skill;
- }
- }
-
- private class FactionListListener implements ActionListener, ItemListener, ChangeListener {
- public void actionPerformed(ActionEvent e) {
- String faction = factionBox.getSelectedItem().toString();
- factionCheckBox.setSelected(joinedFactions.containsKey(faction));
- if (joinedFactions.containsKey(faction)) {
- factionSpinner.setEnabled(true);
- factionSpinner.setValue(joinedFactions.get(faction));
- } else {
- factionSpinner.setEnabled(false);
- factionSpinner.setValue(0);
- }
- }
-
- public void itemStateChanged(ItemEvent e) {
- String faction = factionBox.getSelectedItem().toString();
- if (e.getSource() == factionCheckBox) {
- if (factionCheckBox.isSelected()) {
- if (!joinedFactions.containsKey(faction)) {
- joinedFactions.put(faction, (Integer) factionSpinner.getValue());
- }
- factionSpinner.setEnabled(true);
- } else {
- joinedFactions.remove(faction);
- factionSpinner.setEnabled(false);
- }
- }
- }
-
- public void stateChanged(ChangeEvent ce) {
- String faction = factionBox.getSelectedItem().toString();
- if (joinedFactions.containsKey(faction)) {
- joinedFactions.put(faction, (Integer) factionSpinner.getValue());
- System.out.println("state.factions.put: " + (Integer) factionSpinner.getValue());
- }
- }
- }
-
- @SuppressWarnings("serial")
- private class SpellListAction extends AbstractAction {
- public SpellListAction(String name) {
- super(name);
- }
-
- public void actionPerformed(ActionEvent e) {
- if (e.getActionCommand().equals("Add spell")) {
- String s =
- (String)
- JOptionPane.showInputDialog(
- frame,
- "New spell:",
- "New spell",
- JOptionPane.PLAIN_MESSAGE,
- null,
- spells.toArray(),
- 0);
- if (s != null) {
- spellListModel.addElement(s);
- }
- } else if (e.getActionCommand().equals("Delete spell")) {
- spellListModel.remove(spellList.getSelectedIndex());
- }
- }
- }
-
- @SuppressWarnings("serial")
- private class ItemListAction extends AbstractAction {
- public ItemListAction(String name) {
- super(name);
- }
-
- public void actionPerformed(ActionEvent e) {
- if (e.getActionCommand().equals("Add item")) {
- Object[] items = Editor.resources.getResources(RItem.class).toArray();
- String s =
- (String)
- JOptionPane.showInputDialog(
- frame, "Add item:", "Add item", JOptionPane.PLAIN_MESSAGE, null, items, 0);
- if (s != null) {
- itemListModel.addElement(s);
- }
- } else if (e.getActionCommand().equals("Delete item")) {
- itemListModel.remove(itemList.getSelectedIndex());
- }
- }
- }
-
- @SuppressWarnings("serial")
- private class DestListAction extends AbstractAction implements ListSelectionListener {
- public DestListAction() {
- super();
- }
-
- public DestListAction(String name) {
- super(name);
- }
-
- public void valueChanged(ListSelectionEvent e) {
- try { // in case npc is not a travel agent
- if (currentDest != null) {
- currentDest.setAttribute("x", destX.getValue().toString());
- currentDest.setAttribute("y", destY.getValue().toString());
- currentDest.setAttribute("cost", destCost.getValue().toString());
- }
- currentDest = destMap.get(destList.getSelectedValue());
- destX.setValue(Integer.parseInt(currentDest.getAttributeValue("x")));
- destY.setValue(Integer.parseInt(currentDest.getAttributeValue("y")));
- destCost.setValue(Integer.parseInt(currentDest.getAttributeValue("cost")));
- } catch (NullPointerException f) {
- }
- }
-
- public void actionPerformed(ActionEvent e) {
- if (e.getActionCommand().equals("Add destination")) {
- String s =
- (String)
- JOptionPane.showInputDialog(
- frame, "New destination:", "New destination", JOptionPane.QUESTION_MESSAGE);
- if ((s != null) && (s.length() > 0)) {
- destListModel.addElement(s);
- Element dest = new Element("dest");
- dest.setAttribute("name", s);
- dest.setAttribute("x", "0");
- dest.setAttribute("y", "0");
- dest.setAttribute("cost", "0");
- destMap.put(s, dest);
- }
- } else if (e.getActionCommand().equals("Delete destination")) {
- destMap.remove(destList.getSelectedValue());
- destListModel.remove(destList.getSelectedIndex());
- }
- }
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2013 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.editor.editors;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.text.NumberFormat;
+import java.util.*;
+import javax.swing.*;
+import javax.swing.border.*;
+import javax.swing.event.*;
+import neon.editor.*;
+import neon.editor.help.HelpLabels;
+import neon.editor.resources.RFaction;
+import neon.entities.property.Skill;
+import neon.resources.*;
+import neon.resources.RSpell.SpellType;
+import org.jdom2.Element;
+
+public class NPCEditor extends ObjectEditor implements MouseListener {
+ private RPerson data;
+ private JList spellList, itemList, destList;
+ private JTextField nameField;
+ private JComboBox factionBox;
+ private JComboBox raceBox;
+ private JComboBox aiTypeBox;
+ private JSpinner aggressionSpinner, confidenceSpinner, factionSpinner;
+ private JFormattedTextField rangeField, destX, destY, destCost, skillField;
+ private HashMap skills;
+ private Set trainedSkills;
+ private HashMap joinedFactions;
+ private HashMap destMap;
+ private JCheckBox spellBox,
+ skillBox,
+ tradeBox,
+ travelBox,
+ trainBox,
+ spellMakerBox,
+ factionCheckBox,
+ potionBox,
+ healerBox,
+ tattooBox;
+ private JComboBox skillComboBox;
+ private DefaultListModel destListModel, spellListModel, itemListModel;
+ private Skill currentSkill;
+ private Element currentDest;
+ private ArrayList spells;
+
+ public NPCEditor(JFrame parent, RPerson data) {
+ super(parent, "NPC Editor: " + data.id);
+ this.data = data;
+
+ spells = new ArrayList();
+ for (RSpell spell : Editor.resources.getResources(RSpell.class)) {
+ if (spell.type == SpellType.SPELL) {
+ spells.add(spell.id);
+ }
+ }
+
+ JPanel npcProps = new JPanel();
+ npcProps.setBorder(new TitledBorder("Properties"));
+ BoxLayout propLayout = new BoxLayout(npcProps, BoxLayout.PAGE_AXIS);
+ npcProps.setLayout(propLayout);
+
+ JPanel generalPanel = new JPanel();
+ generalPanel.setBorder(new TitledBorder("General"));
+ nameField = new JTextField(10);
+ raceBox = new JComboBox(Editor.resources.getResources(RCreature.class));
+ generalPanel.add(new JLabel("Name: "));
+ generalPanel.add(nameField);
+ generalPanel.add(new JLabel(" "));
+ generalPanel.add(HelpLabels.getNameHelpLabel());
+ generalPanel.add(new JLabel(" "));
+ generalPanel.add(new JLabel("Species: "));
+ generalPanel.add(raceBox);
+ generalPanel.add(new JLabel(" "));
+ generalPanel.add(HelpLabels.getRaceHelpLabel());
+ generalPanel.setMaximumSize(
+ new Dimension(generalPanel.getMaximumSize().width, generalPanel.getPreferredSize().height));
+
+ JPanel aiPanel = new JPanel();
+ GroupLayout layout = new GroupLayout(aiPanel);
+ aiPanel.setLayout(layout);
+ layout.setAutoCreateGaps(true);
+ JLabel aiTypeLabel = new JLabel("Type: ");
+ JLabel aggressionLabel = new JLabel("Aggression: ");
+ JLabel confidenceLabel = new JLabel("Confidence: ");
+ JLabel rangeLabel = new JLabel("Territory: ");
+ aiTypeBox = new JComboBox(RCreature.AIType.values());
+ aggressionSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 100, 1));
+ confidenceSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 100, 1));
+ rangeField = new JFormattedTextField(NumberFormat.getIntegerInstance());
+ rangeField.setValue(0);
+ JLabel aiHelpLabel = HelpLabels.getAITypeHelpLabel();
+ JLabel confidenceHelpLabel = HelpLabels.getConfidenceHelpLabel();
+ JLabel aggressionHelpLabel = HelpLabels.getAggressionHelpLabel();
+ JLabel rangeHelpLabel = HelpLabels.getRangeHelpLabel();
+ aiPanel.setMaximumSize(
+ new Dimension(generalPanel.getMaximumSize().width, generalPanel.getPreferredSize().height));
+ layout.setVerticalGroup(
+ layout
+ .createSequentialGroup()
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.BASELINE)
+ .addComponent(aiTypeLabel)
+ .addComponent(aiTypeBox)
+ .addComponent(aiHelpLabel)
+ .addComponent(aggressionLabel)
+ .addComponent(aggressionSpinner)
+ .addComponent(aggressionHelpLabel))
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.BASELINE)
+ .addComponent(confidenceLabel)
+ .addComponent(confidenceSpinner)
+ .addComponent(confidenceHelpLabel)
+ .addComponent(rangeLabel)
+ .addComponent(rangeField)
+ .addComponent(rangeHelpLabel)));
+ layout.setHorizontalGroup(
+ layout
+ .createSequentialGroup()
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(
+ aiTypeLabel,
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE)
+ .addComponent(confidenceLabel))
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING, false)
+ .addComponent(
+ aiTypeBox,
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE)
+ .addComponent(confidenceSpinner))
+ .addGap(10)
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(aiHelpLabel)
+ .addComponent(confidenceHelpLabel))
+ .addGap(10)
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(
+ aggressionLabel,
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE)
+ .addComponent(rangeLabel))
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING, false)
+ .addComponent(
+ aggressionSpinner,
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE)
+ .addComponent(rangeField))
+ .addGap(10)
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(aggressionHelpLabel)
+ .addComponent(rangeHelpLabel)));
+ aiPanel.setBorder(new TitledBorder("AI"));
+
+ JTabbedPane servicePane = new JTabbedPane();
+ servicePane.setBorder(new TitledBorder("Services"));
+
+ JPanel spellPanel = new JPanel(new BorderLayout());
+ spellBox = new JCheckBox("Spell trader");
+ spellMakerBox = new JCheckBox("Spell maker");
+ healerBox = new JCheckBox("Healer");
+ JPanel spellBoxPanel = new JPanel();
+ spellBoxPanel.add(spellBox, BorderLayout.PAGE_START);
+ spellBoxPanel.add(spellMakerBox, BorderLayout.CENTER);
+ spellBoxPanel.add(healerBox, BorderLayout.PAGE_END);
+ spellPanel.add(spellBoxPanel, BorderLayout.PAGE_START);
+ spellListModel = new DefaultListModel();
+ spellList = new JList(spellListModel);
+ spellList.addMouseListener(this);
+ JScrollPane spellScroller = new JScrollPane(spellList);
+ spellPanel.add(spellScroller, BorderLayout.CENTER);
+ servicePane.add(spellPanel, "Magic");
+
+ JPanel tradePanel = new JPanel(new BorderLayout());
+ tradeBox = new JCheckBox("Trader");
+ tradeBox.setHorizontalAlignment(SwingConstants.CENTER);
+ tradePanel.add(tradeBox, BorderLayout.PAGE_START);
+ itemListModel = new DefaultListModel();
+ itemList = new JList(itemListModel);
+ itemList.addMouseListener(this);
+ JScrollPane itemScroller = new JScrollPane(itemList);
+ tradePanel.add(itemScroller, BorderLayout.CENTER);
+ servicePane.add(tradePanel, "Trade");
+
+ JPanel skillPanel = new JPanel(new BorderLayout());
+ skills = new HashMap();
+ trainedSkills = new HashSet();
+ trainBox = new JCheckBox("Skill trainer");
+ trainBox.setHorizontalAlignment(SwingConstants.CENTER);
+ skillPanel.add(trainBox, BorderLayout.PAGE_START);
+ JPanel skillSubPanel = new JPanel();
+ skillSubPanel.add(new JLabel("Skills: "));
+ skillComboBox = new JComboBox(Skill.values());
+ skillComboBox.addActionListener(new SkillListListener());
+ skillSubPanel.add(skillComboBox);
+ skillField = new JFormattedTextField(NumberFormat.getIntegerInstance());
+ skillField.setColumns(3);
+ skillSubPanel.add(skillField);
+ skillBox = new JCheckBox("Trainable?");
+ skillSubPanel.add(skillBox);
+ skillPanel.add(skillSubPanel);
+ servicePane.add(skillPanel, "Training");
+
+ JPanel travelPanel = new JPanel(new BorderLayout());
+ destMap = new HashMap();
+ travelBox = new JCheckBox("Travel agent");
+ travelBox.setHorizontalAlignment(SwingConstants.CENTER);
+ travelPanel.add(travelBox, BorderLayout.PAGE_START);
+ destListModel = new DefaultListModel();
+ destList = new JList(destListModel);
+ destList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ destList.addMouseListener(this);
+ destList.addListSelectionListener(new DestListAction());
+ JScrollPane destScroller = new JScrollPane(destList);
+ travelPanel.add(destScroller, BorderLayout.CENTER);
+ JPanel destPanel = new JPanel();
+ destPanel.add(new JLabel("x: "));
+ destX = new JFormattedTextField(NumberFormat.getIntegerInstance());
+ destX.setColumns(5);
+ destPanel.add(destX);
+ destPanel.add(new JLabel("y: "));
+ destY = new JFormattedTextField(NumberFormat.getIntegerInstance());
+ destY.setColumns(5);
+ destPanel.add(destY);
+ destPanel.add(new JLabel("price: "));
+ destCost = new JFormattedTextField(NumberFormat.getIntegerInstance());
+ destCost.setColumns(5);
+ destPanel.add(destCost);
+ travelPanel.add(destPanel, BorderLayout.PAGE_END);
+ servicePane.add(travelPanel, "Travel");
+
+ JPanel otherPanel = new JPanel();
+ potionBox = new JCheckBox("Potion maker");
+ otherPanel.add(potionBox);
+ tattooBox = new JCheckBox("Tattoo artist");
+ otherPanel.add(tattooBox);
+ servicePane.add(otherPanel, "Other");
+
+ // factions
+ JPanel factionPanel = new JPanel();
+
+ joinedFactions = new HashMap();
+ FactionListListener fl = new FactionListListener();
+
+ factionBox = new JComboBox(Editor.resources.getResources(RFaction.class));
+ factionBox.addActionListener(fl);
+ factionPanel.add(factionBox);
+ factionCheckBox = new JCheckBox();
+ factionCheckBox.addItemListener(fl);
+ factionPanel.add(factionCheckBox);
+ factionSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 100, 1));
+ factionSpinner.addChangeListener(fl);
+ factionPanel.add(factionSpinner);
+ factionPanel.add(new JLabel(" "));
+ factionPanel.add(HelpLabels.getFactionHelpLabel());
+ factionPanel.setBorder(new TitledBorder("Factions"));
+
+ npcProps.add(generalPanel);
+ npcProps.add(aiPanel);
+ npcProps.add(factionPanel);
+ npcProps.add(servicePane);
+
+ frame.add(new JScrollPane(npcProps), BorderLayout.CENTER);
+ }
+
+ protected void load() {
+ nameField.setText(data.name);
+ RCreature species = (RCreature) Editor.resources.getResource(data.species);
+ raceBox.setSelectedItem(species);
+
+ for (String s : data.factions.keySet()) {
+ joinedFactions.put(s, data.factions.get(s));
+ }
+ factionCheckBox.setSelected(joinedFactions.containsKey(factionBox.getSelectedItem()));
+ if (joinedFactions.containsKey(factionBox.getSelectedItem())) {
+ factionSpinner.setValue(data.factions.get(factionBox.getSelectedItem()));
+ factionSpinner.setEnabled(true);
+ } else {
+ factionSpinner.setEnabled(false);
+ factionSpinner.setValue(0);
+ }
+
+ if (data.aiType != null) {
+ aiTypeBox.setSelectedItem(data.aiType);
+ } else if (species != null) {
+ aiTypeBox.setSelectedItem(species.aiType);
+ }
+ if (data.aiRange > -1) {
+ rangeField.setValue(data.aiRange);
+ } else if (species != null) {
+ rangeField.setValue(species.aiRange);
+ }
+ if (data.aiAggr > -1) {
+ aggressionSpinner.setValue(data.aiAggr);
+ } else if (species != null) {
+ rangeField.setValue(species.aiAggr);
+ }
+ if (data.aiConf > -1) {
+ confidenceSpinner.setValue(data.aiConf);
+ } else if (species != null) {
+ rangeField.setValue(species.aiConf);
+ }
+
+ skills = data.skills;
+ if (skills.containsKey(skillComboBox.getSelectedItem())) {
+ skillField.setValue(skills.get(skillComboBox.getSelectedItem()));
+ } else {
+ skillField.setValue(0);
+ }
+
+ for (String rs : data.spells) {
+ spellListModel.addElement(rs);
+ }
+
+ for (String i : data.items) {
+ itemListModel.addElement(i);
+ }
+
+ for (RPerson.Service service : data.services) {
+ if (service.id.equals("trade")) {
+ tradeBox.setSelected(true);
+ } else if (service.id.equals("travel")) {
+ travelBox.setSelected(true);
+ for (RPerson.Service.Destination d : service.destinations) {
+ destListModel.addElement(d.name);
+ // Store destination for editing
+ Element destElement = new Element("dest");
+ destElement.setAttribute("name", d.name);
+ destElement.setAttribute("x", String.valueOf(d.x));
+ destElement.setAttribute("y", String.valueOf(d.y));
+ destElement.setAttribute("cost", String.valueOf(d.cost));
+ destMap.put(d.name, destElement);
+ }
+ } else if (service.id.equals("training")) {
+ trainBox.setSelected(true);
+ for (String s : service.skills) {
+ trainedSkills.add(Skill.valueOf(s.toUpperCase()));
+ }
+ skillBox.setSelected(trainedSkills.contains(skillComboBox.getSelectedItem()));
+ } else if (service.id.equals("spells")) {
+ spellBox.setSelected(true);
+ } else if (service.id.equals("spellmaker")) {
+ spellMakerBox.setSelected(true);
+ } else if (service.id.equals("healer")) {
+ healerBox.setSelected(true);
+ } else if (service.id.equals("alchemy")) {
+ potionBox.setSelected(true);
+ } else if (service.id.equals("tattoo")) {
+ tattooBox.setSelected(true);
+ }
+ }
+ }
+
+ public void mouseExited(MouseEvent e) {}
+
+ public void mouseEntered(MouseEvent e) {}
+
+ public void mouseReleased(MouseEvent e) {}
+
+ public void mousePressed(MouseEvent e) {}
+
+ public void mouseClicked(MouseEvent e) {
+ if (e.getButton() == MouseEvent.BUTTON3) {
+ if (e.getComponent() == itemList) {
+ JPopupMenu menu = new JPopupMenu();
+ menu.add(new ItemListAction("Add item"));
+ menu.add(new ItemListAction("Delete item"));
+ menu.show(e.getComponent(), e.getX(), e.getY());
+ itemList.setSelectedIndex(itemList.locationToIndex(e.getPoint()));
+ } else if (e.getComponent() == spellList) {
+ JPopupMenu menu = new JPopupMenu();
+ menu.add(new SpellListAction("Add spell"));
+ menu.add(new SpellListAction("Delete spell"));
+ menu.show(e.getComponent(), e.getX(), e.getY());
+ spellList.setSelectedIndex(spellList.locationToIndex(e.getPoint()));
+ } else if (e.getComponent() == destList) {
+ JPopupMenu menu = new JPopupMenu();
+ menu.add(new DestListAction("Add destination"));
+ menu.add(new DestListAction("Delete destination"));
+ menu.show(e.getComponent(), e.getX(), e.getY());
+ destList.setSelectedIndex(destList.locationToIndex(e.getPoint()));
+ }
+ }
+ }
+
+ protected void save() {
+ data.name = nameField.getText();
+ RCreature species = raceBox.getItemAt(raceBox.getSelectedIndex());
+ data.species = species.id;
+
+ if (species.aiType.equals(aiTypeBox.getItemAt(aiTypeBox.getSelectedIndex()))) {
+ data.aiType = null;
+ } else {
+ data.aiType = aiTypeBox.getItemAt(aiTypeBox.getSelectedIndex());
+ }
+ if (species.aiRange == (Integer) rangeField.getValue()) {
+ data.aiRange = -1;
+ } else {
+ data.aiRange = (Integer) rangeField.getValue();
+ }
+ if (species.aiAggr == (Integer) aggressionSpinner.getValue()) {
+ data.aiAggr = -1;
+ } else {
+ data.aiAggr = (Integer) aggressionSpinner.getValue();
+ }
+ if (species.aiConf == (Integer) confidenceSpinner.getValue()) {
+ data.aiConf = -1;
+ } else {
+ data.aiConf = (Integer) confidenceSpinner.getValue();
+ }
+
+ data.factions.clear();
+ for (String f : joinedFactions.keySet()) {
+ data.factions.put(f, joinedFactions.get(f));
+ }
+
+ data.services.clear();
+ if (tradeBox.isSelected()) {
+ RPerson.Service service = new RPerson.Service();
+ service.id = "trade";
+ data.services.add(service);
+ }
+ data.items.clear();
+ for (Enumeration e = itemListModel.elements(); e.hasMoreElements(); ) {
+ data.items.add(e.nextElement());
+ }
+
+ if (spellMakerBox.isSelected()) {
+ RPerson.Service service = new RPerson.Service();
+ service.id = "spellmaker";
+ data.services.add(service);
+ }
+ if (healerBox.isSelected()) {
+ RPerson.Service service = new RPerson.Service();
+ service.id = "healer";
+ data.services.add(service);
+ }
+ if (spellBox.isSelected()) {
+ RPerson.Service service = new RPerson.Service();
+ service.id = "spells";
+ data.services.add(service);
+ }
+ for (Enumeration e = spellListModel.elements(); e.hasMoreElements(); ) {
+ data.spells.add(e.nextElement());
+ }
+
+ if (trainBox.isSelected()) {
+ RPerson.Service training = new RPerson.Service();
+ training.id = "training";
+ for (Skill s : trainedSkills) {
+ training.skills.add(s.toString());
+ }
+ data.services.add(training);
+ }
+ data.skills.clear();
+ for (Skill s : skills.keySet()) {
+ if (skills.get(s) != null && !skills.get(s).equals(0)) {
+ skills.put(s, skills.get(s));
+ }
+ }
+
+ if (travelBox.isSelected()) {
+ RPerson.Service travel = new RPerson.Service();
+ travel.id = "travel";
+ // a bit of magic to still get the last modified value into destMap
+ if (currentDest != null) {
+ currentDest.setAttribute("x", destX.getValue().toString());
+ currentDest.setAttribute("y", destY.getValue().toString());
+ currentDest.setAttribute("cost", destCost.getValue().toString());
+ }
+ // Convert Element destMap to Service.Destination objects
+ for (Element d : destMap.values()) {
+ RPerson.Service.Destination dest = new RPerson.Service.Destination();
+ dest.name = d.getAttributeValue("name");
+ dest.x = Integer.parseInt(d.getAttributeValue("x"));
+ dest.y = Integer.parseInt(d.getAttributeValue("y"));
+ dest.cost = Integer.parseInt(d.getAttributeValue("cost"));
+ travel.destinations.add(dest);
+ }
+ data.services.add(travel);
+ }
+
+ if (potionBox.isSelected()) {
+ RPerson.Service service = new RPerson.Service();
+ service.id = "alchemy";
+ data.services.add(service);
+ }
+
+ if (tattooBox.isSelected()) {
+ RPerson.Service service = new RPerson.Service();
+ service.id = "tattoo";
+ data.services.add(service);
+ }
+
+ data.setPath(Editor.getStore().getActive().get("id"));
+ }
+
+ private class SkillListListener implements ActionListener {
+ public void actionPerformed(ActionEvent e) {
+ try {
+ skills.put(currentSkill, Integer.parseInt(skillField.getText()));
+ } catch (NumberFormatException f) {
+ }
+ if (skillBox.isSelected()) {
+ trainedSkills.add(currentSkill);
+ } else {
+ trainedSkills.remove(currentSkill);
+ }
+
+ Skill skill = (Skill) skillComboBox.getSelectedItem();
+ if (skills.containsKey(skill)) {
+ skillField.setText(skills.get(skill).toString());
+ } else {
+ skillField.setText("0");
+ }
+ skillBox.setSelected(trainedSkills.contains(skill));
+ currentSkill = skill;
+ }
+ }
+
+ private class FactionListListener implements ActionListener, ItemListener, ChangeListener {
+ public void actionPerformed(ActionEvent e) {
+ String faction = factionBox.getSelectedItem().toString();
+ factionCheckBox.setSelected(joinedFactions.containsKey(faction));
+ if (joinedFactions.containsKey(faction)) {
+ factionSpinner.setEnabled(true);
+ factionSpinner.setValue(joinedFactions.get(faction));
+ } else {
+ factionSpinner.setEnabled(false);
+ factionSpinner.setValue(0);
+ }
+ }
+
+ public void itemStateChanged(ItemEvent e) {
+ String faction = factionBox.getSelectedItem().toString();
+ if (e.getSource() == factionCheckBox) {
+ if (factionCheckBox.isSelected()) {
+ if (!joinedFactions.containsKey(faction)) {
+ joinedFactions.put(faction, (Integer) factionSpinner.getValue());
+ }
+ factionSpinner.setEnabled(true);
+ } else {
+ joinedFactions.remove(faction);
+ factionSpinner.setEnabled(false);
+ }
+ }
+ }
+
+ public void stateChanged(ChangeEvent ce) {
+ String faction = factionBox.getSelectedItem().toString();
+ if (joinedFactions.containsKey(faction)) {
+ joinedFactions.put(faction, (Integer) factionSpinner.getValue());
+ System.out.println("state.factions.put: " + (Integer) factionSpinner.getValue());
+ }
+ }
+ }
+
+ @SuppressWarnings("serial")
+ private class SpellListAction extends AbstractAction {
+ public SpellListAction(String name) {
+ super(name);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if (e.getActionCommand().equals("Add spell")) {
+ String s =
+ (String)
+ JOptionPane.showInputDialog(
+ frame,
+ "New spell:",
+ "New spell",
+ JOptionPane.PLAIN_MESSAGE,
+ null,
+ spells.toArray(),
+ 0);
+ if (s != null) {
+ spellListModel.addElement(s);
+ }
+ } else if (e.getActionCommand().equals("Delete spell")) {
+ spellListModel.remove(spellList.getSelectedIndex());
+ }
+ }
+ }
+
+ @SuppressWarnings("serial")
+ private class ItemListAction extends AbstractAction {
+ public ItemListAction(String name) {
+ super(name);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if (e.getActionCommand().equals("Add item")) {
+ Object[] items = Editor.resources.getResources(RItem.class).toArray();
+ String s =
+ (String)
+ JOptionPane.showInputDialog(
+ frame, "Add item:", "Add item", JOptionPane.PLAIN_MESSAGE, null, items, 0);
+ if (s != null) {
+ itemListModel.addElement(s);
+ }
+ } else if (e.getActionCommand().equals("Delete item")) {
+ itemListModel.remove(itemList.getSelectedIndex());
+ }
+ }
+ }
+
+ @SuppressWarnings("serial")
+ private class DestListAction extends AbstractAction implements ListSelectionListener {
+ public DestListAction() {
+ super();
+ }
+
+ public DestListAction(String name) {
+ super(name);
+ }
+
+ public void valueChanged(ListSelectionEvent e) {
+ try { // in case npc is not a travel agent
+ if (currentDest != null) {
+ currentDest.setAttribute("x", destX.getValue().toString());
+ currentDest.setAttribute("y", destY.getValue().toString());
+ currentDest.setAttribute("cost", destCost.getValue().toString());
+ }
+ currentDest = destMap.get(destList.getSelectedValue());
+ destX.setValue(Integer.parseInt(currentDest.getAttributeValue("x")));
+ destY.setValue(Integer.parseInt(currentDest.getAttributeValue("y")));
+ destCost.setValue(Integer.parseInt(currentDest.getAttributeValue("cost")));
+ } catch (NullPointerException f) {
+ }
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if (e.getActionCommand().equals("Add destination")) {
+ String s =
+ (String)
+ JOptionPane.showInputDialog(
+ frame, "New destination:", "New destination", JOptionPane.QUESTION_MESSAGE);
+ if ((s != null) && (s.length() > 0)) {
+ destListModel.addElement(s);
+ Element dest = new Element("dest");
+ dest.setAttribute("name", s);
+ dest.setAttribute("x", "0");
+ dest.setAttribute("y", "0");
+ dest.setAttribute("cost", "0");
+ destMap.put(s, dest);
+ }
+ } else if (e.getActionCommand().equals("Delete destination")) {
+ destMap.remove(destList.getSelectedValue());
+ destListModel.remove(destList.getSelectedIndex());
+ }
+ }
+ }
+}
diff --git a/src/main/java/neon/editor/editors/QuestEditor.java b/src/main/java/neon/editor/editors/QuestEditor.java
index 9b7088f..6addd43 100644
--- a/src/main/java/neon/editor/editors/QuestEditor.java
+++ b/src/main/java/neon/editor/editors/QuestEditor.java
@@ -28,8 +28,8 @@
import neon.editor.DialogEditor;
import neon.editor.NeonFormat;
import neon.editor.help.HelpLabels;
+import neon.resources.quest.QuestVariable;
import neon.resources.quest.RQuest;
-import org.jdom2.Element;
public class QuestEditor extends ObjectEditor implements ActionListener, MouseListener {
private RQuest quest;
@@ -148,19 +148,16 @@ protected void save() {
quest.getConditions().add(data.get(0));
}
- Element vars = new Element("objects");
+ // Convert table data to QuestVariable objects
+ quest.getVariables().clear();
for (Vector data : (Vector) varModel.getDataVector()) {
- Element var = new Element(data.get(1).toString());
- var.setText(data.get(0).toString());
- if (data.get(2) != null) {
- var.setAttribute("id", data.get(2).toString());
- }
- if (data.get(3) != null) {
- var.setAttribute("type", data.get(3).toString());
- }
- vars.addContent(var);
+ QuestVariable var = new QuestVariable();
+ var.name = data.get(0) != null ? data.get(0).toString() : null;
+ var.category = data.get(1) != null ? data.get(1).toString() : null;
+ var.id = data.get(2) != null ? data.get(2).toString() : null;
+ var.typeFilter = data.get(3) != null ? data.get(3).toString() : null;
+ quest.getVariables().add(var);
}
- quest.variables = vars;
// quest.getTopics().clear();
for (Vector data : (Vector) dialogModel.getDataVector()) {
@@ -183,16 +180,10 @@ protected void load() {
freqField.setValue(null);
}
- if (quest.variables != null) {
- for (Element item : quest.variables.getChildren()) {
- String[] data = {
- item.getText(),
- item.getName(),
- item.getAttributeValue("id"),
- item.getAttributeValue("type")
- };
- varModel.insertRow(0, data);
- }
+ // Load QuestVariable objects into table
+ for (QuestVariable var : quest.getVariables()) {
+ String[] data = {var.name, var.category, var.id, var.typeFilter};
+ varModel.insertRow(0, data);
}
for (String condition : quest.getConditions()) {
diff --git a/src/main/java/neon/editor/editors/ZoneThemeEditor.java b/src/main/java/neon/editor/editors/ZoneThemeEditor.java
index eaeb13f..5fd650f 100644
--- a/src/main/java/neon/editor/editors/ZoneThemeEditor.java
+++ b/src/main/java/neon/editor/editors/ZoneThemeEditor.java
@@ -1,356 +1,362 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2012 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.editor.editors;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableColumn;
-import neon.editor.Editor;
-import neon.editor.NeonFormat;
-import neon.editor.help.HelpLabels;
-import neon.resources.RCreature;
-import neon.resources.RItem;
-import neon.resources.RTerrain;
-import neon.resources.RZoneTheme;
-
-@SuppressWarnings("serial")
-public class ZoneThemeEditor extends ObjectEditor implements MouseListener {
- private JTextField floorField, wallsField, doorsField;
- private JFormattedTextField minField, maxField;
- private DefaultTableModel creatureModel, itemModel, featureModel;
- private JTable creatureTable, itemTable, featureTable;
- private RZoneTheme theme;
- private JComboBox typeBox;
-
- public ZoneThemeEditor(JFrame parent, RZoneTheme theme) {
- super(parent, "Zone theme: " + theme.id);
- this.theme = theme;
-
- JPanel props = new JPanel();
- GroupLayout layout = new GroupLayout(props);
- props.setLayout(layout);
- layout.setAutoCreateGaps(true);
- props.setBorder(new TitledBorder("Properties"));
- String[] types = {"cave", "pits", "maze", "mine", "bsp", "packed", "sparse"};
- typeBox = new JComboBox(types);
- floorField = new JTextField(15);
- wallsField = new JTextField(15);
- doorsField = new JTextField(15);
- minField = new JFormattedTextField(NeonFormat.getIntegerInstance());
- maxField = new JFormattedTextField(NeonFormat.getIntegerInstance());
- JLabel typeLabel = new JLabel("Type: ");
- JLabel floorLabel = new JLabel("Floors: ");
- JLabel wallsLabel = new JLabel("Walls: ");
- JLabel doorsLabel = new JLabel("Doors: ");
- JLabel minLabel = new JLabel("Min. size: ");
- JLabel maxLabel = new JLabel("Max. size: ");
- JLabel floorHelpLabel = HelpLabels.getFloorHelpLabel();
- JLabel wallHelpLabel = HelpLabels.getWallHelpLabel();
- JLabel doorHelpLabel = HelpLabels.getDoorHelpLabel();
- JLabel minHelpLabel = HelpLabels.getMinSizeHelpLabel();
- JLabel maxHelpLabel = HelpLabels.getMaxSizeHelpLabel();
- layout.setVerticalGroup(
- layout
- .createSequentialGroup()
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.BASELINE)
- .addComponent(typeLabel)
- .addComponent(typeBox)
- .addComponent(floorLabel)
- .addComponent(floorField)
- .addComponent(floorHelpLabel))
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.BASELINE)
- .addComponent(wallsLabel)
- .addComponent(wallsField)
- .addComponent(wallHelpLabel)
- .addComponent(doorsLabel)
- .addComponent(doorsField)
- .addComponent(doorHelpLabel))
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.BASELINE)
- .addComponent(minLabel)
- .addComponent(minField)
- .addComponent(minHelpLabel)
- .addComponent(maxLabel)
- .addComponent(maxField)
- .addComponent(maxHelpLabel)));
- layout.setHorizontalGroup(
- layout
- .createSequentialGroup()
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(typeLabel)
- .addComponent(wallsLabel)
- .addComponent(
- minLabel,
- GroupLayout.PREFERRED_SIZE,
- GroupLayout.DEFAULT_SIZE,
- GroupLayout.PREFERRED_SIZE))
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(typeBox)
- .addComponent(wallsField)
- .addComponent(minField))
- .addGap(10)
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING, false)
- .addComponent(wallHelpLabel)
- .addComponent(minHelpLabel))
- .addGap(10)
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(floorLabel)
- .addComponent(doorsLabel)
- .addComponent(maxLabel))
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING, false)
- .addComponent(
- floorField,
- GroupLayout.PREFERRED_SIZE,
- GroupLayout.DEFAULT_SIZE,
- GroupLayout.PREFERRED_SIZE)
- .addComponent(doorsField)
- .addComponent(maxField))
- .addGap(10)
- .addGroup(
- layout
- .createParallelGroup(GroupLayout.Alignment.LEADING, false)
- .addComponent(floorHelpLabel)
- .addComponent(doorHelpLabel)
- .addComponent(maxHelpLabel)));
-
- JTabbedPane stuff = new JTabbedPane();
-
- String[] columns = {"id", "chance"};
- itemModel = new ThemesTableModel(columns, String.class, Integer.class);
- itemTable = new JTable(itemModel);
- itemTable.setFillsViewportHeight(true);
- itemTable.addMouseListener(this);
- JScrollPane itemScroller = new JScrollPane(itemTable);
-
- creatureModel = new ThemesTableModel(columns, String.class, Integer.class);
- creatureTable = new JTable(creatureModel);
- creatureTable.setFillsViewportHeight(true);
- creatureTable.addMouseListener(this);
- JScrollPane creatureScroller = new JScrollPane(creatureTable);
-
- String[] moreColumns = {"id", "type", "size", "chance"};
- featureModel =
- new ThemesTableModel(moreColumns, String.class, String.class, Integer.class, Integer.class);
- featureTable = new JTable(featureModel);
- featureTable.setFillsViewportHeight(true);
- featureTable.addMouseListener(this);
- TableColumn typeColumn = featureTable.getColumnModel().getColumn(1);
- JComboBox comboBox = new JComboBox();
- comboBox.addItem("stain");
- comboBox.addItem("lake");
- comboBox.addItem("patch");
- comboBox.addItem("river");
- typeColumn.setCellEditor(new DefaultCellEditor(comboBox));
- JScrollPane featureScroller = new JScrollPane(featureTable);
-
- stuff.add("Features", featureScroller);
- stuff.add("Items", itemScroller);
- stuff.add("Creatures", creatureScroller);
- stuff.setBorder(new TitledBorder("Contents"));
-
- JPanel center = new JPanel(new BorderLayout());
- center.add(props, BorderLayout.PAGE_START);
- center.add(stuff);
-
- frame.add(center, BorderLayout.CENTER);
- }
-
- protected void save() {
- theme.type = typeBox.getSelectedItem().toString();
- theme.floor = floorField.getText();
- theme.walls = wallsField.getText();
- theme.doors = doorsField.getText();
- theme.min = Integer.parseInt(minField.getText());
- theme.max = Integer.parseInt(maxField.getText());
- theme.setPath(Editor.getStore().getActive().get("id"));
-
- theme.creatures.clear();
- for (Vector data : (Vector) creatureModel.getDataVector()) {
- theme.creatures.put(data.get(0).toString(), (Integer) data.get(1));
- }
-
- theme.features.clear();
- for (Vector data : (Vector) featureModel.getDataVector()) {
- theme.features.add(data.toArray());
- }
-
- theme.items.clear();
- for (Vector data : (Vector) itemModel.getDataVector()) {
- theme.items.put(data.get(0).toString(), (Integer) data.get(1));
- }
- }
-
- protected void load() {
- typeBox.setSelectedItem(theme.type);
- floorField.setText(theme.floor);
- wallsField.setText(theme.walls);
- doorsField.setText(theme.doors);
- minField.setValue(theme.min);
- maxField.setValue(theme.max);
-
- creatureModel.setNumRows(0);
- featureModel.setNumRows(0);
- itemModel.setNumRows(0);
-
- for (Map.Entry creature : theme.creatures.entrySet()) {
- Object[] data = {creature.getKey(), creature.getValue()};
- creatureModel.insertRow(0, data);
- }
-
- for (Map.Entry item : theme.items.entrySet()) {
- Object[] data = {item.getKey(), item.getValue()};
- itemModel.insertRow(0, data);
- }
-
- for (Object[] feature : theme.features) {
- featureModel.insertRow(0, feature);
- }
- }
-
- public void mousePressed(MouseEvent e) {}
-
- public void mouseReleased(MouseEvent e) {}
-
- public void mouseEntered(MouseEvent e) {}
-
- public void mouseExited(MouseEvent e) {}
-
- public void mouseClicked(MouseEvent e) {
- if (e.getButton() == MouseEvent.BUTTON3) {
- JPopupMenu menu = new JPopupMenu();
- if (e.getSource().equals(itemTable)) {
- menu.add(new ClickAction("Add item"));
- menu.add(new ClickAction("Remove item"));
- int row = itemTable.rowAtPoint(e.getPoint());
- itemTable.getSelectionModel().setSelectionInterval(row, row);
- } else if (e.getSource().equals(creatureTable)) {
- menu.add(new ClickAction("Add creature"));
- menu.add(new ClickAction("Remove creature"));
- int row = creatureTable.rowAtPoint(e.getPoint());
- creatureTable.getSelectionModel().setSelectionInterval(row, row);
- } else if (e.getSource().equals(featureTable)) {
- menu.add(new ClickAction("Add feature"));
- menu.add(new ClickAction("Remove feature"));
- int row = featureTable.rowAtPoint(e.getPoint());
- featureTable.getSelectionModel().setSelectionInterval(row, row);
- }
- menu.show(e.getComponent(), e.getX(), e.getY());
- }
- }
-
- private class ClickAction extends AbstractAction {
- public ClickAction(String name) {
- super(name);
- }
-
- public void actionPerformed(ActionEvent e) {
- if (e.getActionCommand().equals("Add item")) {
- Object[] items = Editor.resources.getResources(RItem.class).toArray();
- String s =
- (String)
- JOptionPane.showInputDialog(
- frame,
- "Choose item:",
- "Add item",
- JOptionPane.PLAIN_MESSAGE,
- null,
- items,
- "ham");
- if (s != null) {
- String[] row = {s, "1"};
- itemModel.addRow(row);
- }
- } else if (e.getActionCommand().equals("Remove item")) {
- itemModel.removeRow(itemTable.getSelectedRow());
- } else if (e.getActionCommand().equals("Add feature")) {
- Object[] terrain = Editor.resources.getResources(RTerrain.class).toArray();
- String s =
- (String)
- JOptionPane.showInputDialog(
- frame,
- "Choose terrain type:",
- "Add feature",
- JOptionPane.PLAIN_MESSAGE,
- null,
- terrain,
- "ham");
- if (s != null) {
- String[] row = {s, "patch", "1", "1"};
- featureModel.addRow(row);
- }
- } else if (e.getActionCommand().equals("Remove feature")) {
- featureModel.removeRow(featureTable.getSelectedRow());
- } else if (e.getActionCommand().equals("Add creature")) {
- Object[] creatures = Editor.resources.getResources(RCreature.class).toArray();
- String s =
- JOptionPane.showInputDialog(
- frame,
- "Choose creature:",
- "Add creature",
- JOptionPane.PLAIN_MESSAGE,
- null,
- creatures,
- null)
- .toString();
- if (s != null) {
- String[] row = {s, "1"};
- creatureModel.addRow(row);
- }
- } else if (e.getActionCommand().equals("Remove creature")) {
- creatureModel.removeRow(creatureTable.getSelectedRow());
- }
- }
- }
-
- private static class ThemesTableModel extends DefaultTableModel {
- private Class[] classes;
-
- public ThemesTableModel(String[] columns, Class... classes) {
- super(columns, 0);
- this.classes = classes;
- }
-
- public Class getColumnClass(int i) {
- return classes[i];
- }
-
- public boolean isCellEditable(int row, int column) {
- return column != 0;
- }
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.editor.editors;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+import javax.swing.*;
+import javax.swing.border.*;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
+import neon.editor.Editor;
+import neon.editor.NeonFormat;
+import neon.editor.help.HelpLabels;
+import neon.resources.RCreature;
+import neon.resources.RItem;
+import neon.resources.RTerrain;
+import neon.resources.RZoneTheme;
+
+@SuppressWarnings("serial")
+public class ZoneThemeEditor extends ObjectEditor implements MouseListener {
+ private JTextField floorField, wallsField, doorsField;
+ private JFormattedTextField minField, maxField;
+ private DefaultTableModel creatureModel, itemModel, featureModel;
+ private JTable creatureTable, itemTable, featureTable;
+ private RZoneTheme theme;
+ private JComboBox typeBox;
+
+ public ZoneThemeEditor(JFrame parent, RZoneTheme theme) {
+ super(parent, "Zone theme: " + theme.id);
+ this.theme = theme;
+
+ JPanel props = new JPanel();
+ GroupLayout layout = new GroupLayout(props);
+ props.setLayout(layout);
+ layout.setAutoCreateGaps(true);
+ props.setBorder(new TitledBorder("Properties"));
+ String[] types = {"cave", "pits", "maze", "mine", "bsp", "packed", "sparse"};
+ typeBox = new JComboBox(types);
+ floorField = new JTextField(15);
+ wallsField = new JTextField(15);
+ doorsField = new JTextField(15);
+ minField = new JFormattedTextField(NeonFormat.getIntegerInstance());
+ maxField = new JFormattedTextField(NeonFormat.getIntegerInstance());
+ JLabel typeLabel = new JLabel("Type: ");
+ JLabel floorLabel = new JLabel("Floors: ");
+ JLabel wallsLabel = new JLabel("Walls: ");
+ JLabel doorsLabel = new JLabel("Doors: ");
+ JLabel minLabel = new JLabel("Min. size: ");
+ JLabel maxLabel = new JLabel("Max. size: ");
+ JLabel floorHelpLabel = HelpLabels.getFloorHelpLabel();
+ JLabel wallHelpLabel = HelpLabels.getWallHelpLabel();
+ JLabel doorHelpLabel = HelpLabels.getDoorHelpLabel();
+ JLabel minHelpLabel = HelpLabels.getMinSizeHelpLabel();
+ JLabel maxHelpLabel = HelpLabels.getMaxSizeHelpLabel();
+ layout.setVerticalGroup(
+ layout
+ .createSequentialGroup()
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.BASELINE)
+ .addComponent(typeLabel)
+ .addComponent(typeBox)
+ .addComponent(floorLabel)
+ .addComponent(floorField)
+ .addComponent(floorHelpLabel))
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.BASELINE)
+ .addComponent(wallsLabel)
+ .addComponent(wallsField)
+ .addComponent(wallHelpLabel)
+ .addComponent(doorsLabel)
+ .addComponent(doorsField)
+ .addComponent(doorHelpLabel))
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.BASELINE)
+ .addComponent(minLabel)
+ .addComponent(minField)
+ .addComponent(minHelpLabel)
+ .addComponent(maxLabel)
+ .addComponent(maxField)
+ .addComponent(maxHelpLabel)));
+ layout.setHorizontalGroup(
+ layout
+ .createSequentialGroup()
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(typeLabel)
+ .addComponent(wallsLabel)
+ .addComponent(
+ minLabel,
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE))
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(typeBox)
+ .addComponent(wallsField)
+ .addComponent(minField))
+ .addGap(10)
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING, false)
+ .addComponent(wallHelpLabel)
+ .addComponent(minHelpLabel))
+ .addGap(10)
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING)
+ .addComponent(floorLabel)
+ .addComponent(doorsLabel)
+ .addComponent(maxLabel))
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING, false)
+ .addComponent(
+ floorField,
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE)
+ .addComponent(doorsField)
+ .addComponent(maxField))
+ .addGap(10)
+ .addGroup(
+ layout
+ .createParallelGroup(GroupLayout.Alignment.LEADING, false)
+ .addComponent(floorHelpLabel)
+ .addComponent(doorHelpLabel)
+ .addComponent(maxHelpLabel)));
+
+ JTabbedPane stuff = new JTabbedPane();
+
+ String[] columns = {"id", "chance"};
+ itemModel = new ThemesTableModel(columns, String.class, Integer.class);
+ itemTable = new JTable(itemModel);
+ itemTable.setFillsViewportHeight(true);
+ itemTable.addMouseListener(this);
+ JScrollPane itemScroller = new JScrollPane(itemTable);
+
+ creatureModel = new ThemesTableModel(columns, String.class, Integer.class);
+ creatureTable = new JTable(creatureModel);
+ creatureTable.setFillsViewportHeight(true);
+ creatureTable.addMouseListener(this);
+ JScrollPane creatureScroller = new JScrollPane(creatureTable);
+
+ String[] moreColumns = {"id", "type", "size", "chance"};
+ featureModel =
+ new ThemesTableModel(moreColumns, String.class, String.class, Integer.class, Integer.class);
+ featureTable = new JTable(featureModel);
+ featureTable.setFillsViewportHeight(true);
+ featureTable.addMouseListener(this);
+ TableColumn typeColumn = featureTable.getColumnModel().getColumn(1);
+ JComboBox comboBox = new JComboBox();
+ comboBox.addItem("stain");
+ comboBox.addItem("lake");
+ comboBox.addItem("patch");
+ comboBox.addItem("river");
+ typeColumn.setCellEditor(new DefaultCellEditor(comboBox));
+ JScrollPane featureScroller = new JScrollPane(featureTable);
+
+ stuff.add("Features", featureScroller);
+ stuff.add("Items", itemScroller);
+ stuff.add("Creatures", creatureScroller);
+ stuff.setBorder(new TitledBorder("Contents"));
+
+ JPanel center = new JPanel(new BorderLayout());
+ center.add(props, BorderLayout.PAGE_START);
+ center.add(stuff);
+
+ frame.add(center, BorderLayout.CENTER);
+ }
+
+ protected void save() {
+ theme.type = typeBox.getSelectedItem().toString();
+ theme.floor = floorField.getText();
+ theme.walls = wallsField.getText();
+ theme.doors = doorsField.getText();
+ theme.min = Integer.parseInt(minField.getText());
+ theme.max = Integer.parseInt(maxField.getText());
+ theme.setPath(Editor.getStore().getActive().get("id"));
+
+ theme.creatures.clear();
+ for (Vector data : (Vector) creatureModel.getDataVector()) {
+ theme.creatures.put(data.get(0).toString(), (Integer) data.get(1));
+ }
+
+ theme.features.clear();
+ for (Vector data : (Vector) featureModel.getDataVector()) {
+ RZoneTheme.Feature feature = new RZoneTheme.Feature();
+ feature.value = data.get(0).toString();
+ feature.t = data.get(1).toString();
+ feature.s = (Integer) data.get(2);
+ feature.n = (Integer) data.get(3);
+ theme.features.add(feature);
+ }
+
+ theme.items.clear();
+ for (Vector data : (Vector) itemModel.getDataVector()) {
+ theme.items.put(data.get(0).toString(), (Integer) data.get(1));
+ }
+ }
+
+ protected void load() {
+ typeBox.setSelectedItem(theme.type);
+ floorField.setText(theme.floor);
+ wallsField.setText(theme.walls);
+ doorsField.setText(theme.doors);
+ minField.setValue(theme.min);
+ maxField.setValue(theme.max);
+
+ creatureModel.setNumRows(0);
+ featureModel.setNumRows(0);
+ itemModel.setNumRows(0);
+
+ for (Map.Entry creature : theme.creatures.entrySet()) {
+ Object[] data = {creature.getKey(), creature.getValue()};
+ creatureModel.insertRow(0, data);
+ }
+
+ for (Map.Entry item : theme.items.entrySet()) {
+ Object[] data = {item.getKey(), item.getValue()};
+ itemModel.insertRow(0, data);
+ }
+
+ for (RZoneTheme.Feature feature : theme.features) {
+ Object[] data = {feature.value, feature.t, feature.s, feature.n};
+ featureModel.insertRow(0, data);
+ }
+ }
+
+ public void mousePressed(MouseEvent e) {}
+
+ public void mouseReleased(MouseEvent e) {}
+
+ public void mouseEntered(MouseEvent e) {}
+
+ public void mouseExited(MouseEvent e) {}
+
+ public void mouseClicked(MouseEvent e) {
+ if (e.getButton() == MouseEvent.BUTTON3) {
+ JPopupMenu menu = new JPopupMenu();
+ if (e.getSource().equals(itemTable)) {
+ menu.add(new ClickAction("Add item"));
+ menu.add(new ClickAction("Remove item"));
+ int row = itemTable.rowAtPoint(e.getPoint());
+ itemTable.getSelectionModel().setSelectionInterval(row, row);
+ } else if (e.getSource().equals(creatureTable)) {
+ menu.add(new ClickAction("Add creature"));
+ menu.add(new ClickAction("Remove creature"));
+ int row = creatureTable.rowAtPoint(e.getPoint());
+ creatureTable.getSelectionModel().setSelectionInterval(row, row);
+ } else if (e.getSource().equals(featureTable)) {
+ menu.add(new ClickAction("Add feature"));
+ menu.add(new ClickAction("Remove feature"));
+ int row = featureTable.rowAtPoint(e.getPoint());
+ featureTable.getSelectionModel().setSelectionInterval(row, row);
+ }
+ menu.show(e.getComponent(), e.getX(), e.getY());
+ }
+ }
+
+ private class ClickAction extends AbstractAction {
+ public ClickAction(String name) {
+ super(name);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if (e.getActionCommand().equals("Add item")) {
+ Object[] items = Editor.resources.getResources(RItem.class).toArray();
+ String s =
+ (String)
+ JOptionPane.showInputDialog(
+ frame,
+ "Choose item:",
+ "Add item",
+ JOptionPane.PLAIN_MESSAGE,
+ null,
+ items,
+ "ham");
+ if (s != null) {
+ String[] row = {s, "1"};
+ itemModel.addRow(row);
+ }
+ } else if (e.getActionCommand().equals("Remove item")) {
+ itemModel.removeRow(itemTable.getSelectedRow());
+ } else if (e.getActionCommand().equals("Add feature")) {
+ Object[] terrain = Editor.resources.getResources(RTerrain.class).toArray();
+ String s =
+ (String)
+ JOptionPane.showInputDialog(
+ frame,
+ "Choose terrain type:",
+ "Add feature",
+ JOptionPane.PLAIN_MESSAGE,
+ null,
+ terrain,
+ "ham");
+ if (s != null) {
+ String[] row = {s, "patch", "1", "1"};
+ featureModel.addRow(row);
+ }
+ } else if (e.getActionCommand().equals("Remove feature")) {
+ featureModel.removeRow(featureTable.getSelectedRow());
+ } else if (e.getActionCommand().equals("Add creature")) {
+ Object[] creatures = Editor.resources.getResources(RCreature.class).toArray();
+ String s =
+ JOptionPane.showInputDialog(
+ frame,
+ "Choose creature:",
+ "Add creature",
+ JOptionPane.PLAIN_MESSAGE,
+ null,
+ creatures,
+ null)
+ .toString();
+ if (s != null) {
+ String[] row = {s, "1"};
+ creatureModel.addRow(row);
+ }
+ } else if (e.getActionCommand().equals("Remove creature")) {
+ creatureModel.removeRow(creatureTable.getSelectedRow());
+ }
+ }
+ }
+
+ private static class ThemesTableModel extends DefaultTableModel {
+ private Class[] classes;
+
+ public ThemesTableModel(String[] columns, Class... classes) {
+ super(columns, 0);
+ this.classes = classes;
+ }
+
+ public Class getColumnClass(int i) {
+ return classes[i];
+ }
+
+ public boolean isCellEditable(int row, int column) {
+ return column != 0;
+ }
+ }
+}
diff --git a/src/main/java/neon/editor/resources/IObject.java b/src/main/java/neon/editor/resources/IObject.java
index 5cf1d66..2f1b726 100644
--- a/src/main/java/neon/editor/resources/IObject.java
+++ b/src/main/java/neon/editor/resources/IObject.java
@@ -30,6 +30,8 @@
public class IObject extends Instance {
public final int uid;
+ private JVShape cachedSvgShape;
+ private String cachedSvgContent;
public IObject(RData resource, int x, int y, int z, int uid) {
super(resource, x, y, z, 1, 1);
@@ -53,14 +55,20 @@ public IObject(Element properties) {
public void paint(Graphics2D graphics, float zoom, boolean isSelected) {
if (resource instanceof RItem && ((RItem) resource).svg != null) {
if (MapEditor.isVisible(this)) {
- JVShape shape = SVGLoader.loadShape(((RItem) resource).svg);
- shape.setX(x);
- shape.setY(y);
- width = shape.getBounds().width;
- height = shape.getBounds().height;
- shape.paint(graphics, zoom, isSelected);
+ // Only reload SVG shape if content has changed (caching optimization)
+ String currentSvg = ((RItem) resource).svg;
+ if (cachedSvgShape == null || !currentSvg.equals(cachedSvgContent)) {
+ cachedSvgShape = SVGLoader.loadShape(currentSvg);
+ cachedSvgContent = currentSvg;
+ }
+
+ cachedSvgShape.setX(x);
+ cachedSvgShape.setY(y);
+ width = cachedSvgShape.getBounds().width;
+ height = cachedSvgShape.getBounds().height;
+ cachedSvgShape.paint(graphics, zoom, isSelected);
if (isSelected) {
- graphics.setPaint(shape.getPaint());
+ graphics.setPaint(cachedSvgShape.getPaint());
Rectangle2D rect = new Rectangle2D.Float(x * zoom, y * zoom, width * zoom, height * zoom);
graphics.draw(rect);
}
diff --git a/src/main/java/neon/editor/resources/RMap.java b/src/main/java/neon/editor/resources/RMap.java
index 46e0dfc..d4f893a 100644
--- a/src/main/java/neon/editor/resources/RMap.java
+++ b/src/main/java/neon/editor/resources/RMap.java
@@ -1,224 +1,434 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2013 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.editor.resources;
-
-import java.util.*;
-import neon.editor.Editor;
-import neon.editor.maps.*;
-import neon.resources.RData;
-import neon.resources.RDungeonTheme;
-import neon.systems.files.XMLTranslator;
-import neon.ui.graphics.Renderable;
-import org.jdom2.*;
-
-/*
- * life cycle of a map:
- * A. existing map:
- * 1. load map
- * 2. load zones
- * B. new map:
- * a. dungeon
- * b. random dungeon
- * c. outdoor
- */
-public class RMap extends RData {
- // id van map = path
- public static final boolean DUNGEON = true;
- public HashMap zones = new HashMap();
- public RDungeonTheme theme;
- public short uid;
- private boolean type;
- private ArrayList uids;
-
- // for already existing maps during loadMod
- public RMap(String id, Element properties, String... path) {
- super(id, path);
- uid = Short.parseShort(properties.getChild("header").getAttributeValue("uid"));
- name = properties.getChild("header").getChildText("name");
- type = properties.getName().equals("dungeon");
-
- if (type == DUNGEON) {
- if (properties.getChild("header").getAttribute("theme") != null) {
- theme =
- (RDungeonTheme)
- Editor.resources.getResource(
- properties.getChild("header").getAttributeValue("theme"), "theme");
- } else {
- for (Element zone : properties.getChildren("level")) {
- zones.put(Integer.parseInt(zone.getAttributeValue("l")), new RZone(zone, this, path));
- }
- }
- } else {
- zones.put(0, new RZone(properties, this, path));
- }
- }
-
- // for new maps to be created
- public RMap(short uid, String mod, MapDialog.Properties props) {
- super(props.getID(), mod);
- this.uid = uid;
- type = props.isDungeon();
- name = props.getName();
-
- if (!props.isDungeon()) { // always set zone and base region for outdoor
- Element region = new Element("region");
- region.setAttribute("x", "0");
- region.setAttribute("y", "0");
- region.setAttribute("w", Integer.toString(props.getWidth()));
- region.setAttribute("h", Integer.toString(props.getHeight()));
- region.setAttribute("text", props.getTerrain());
- region.setAttribute("l", "0");
- Instance ri = new IRegion(region);
- RZone zone = new RZone(name, mod, ri, this);
- zones.put(0, zone);
- }
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public boolean isDungeon() {
- return type;
- }
-
- public RZone getZone(int index) {
- if (zones.isEmpty()) {
- load();
- }
- return zones.get(index);
- }
-
- public int getZone(RZone zone) {
- if (zones.isEmpty()) {
- load();
- }
-
- for (Integer i : zones.keySet()) {
- if (zones.get(i) == zone) {
- return i;
- }
- }
- return 0;
- }
-
- public short getUID() {
- return uid;
- }
-
- public String toString() {
- return name;
- }
-
- // also remove objects from tree if needed!!!
- public void removeObjectUID(int uid) {
- uids.remove((Integer) uid); // because remove(int) removes the int'th value
- }
-
- // don't forget to add objects to the tree!!!
- public int createUID(Element e) {
- int hash = e.hashCode();
- while (uids.contains(hash)) {
- hash++;
- }
- uids.add(hash);
- return hash;
- }
-
- public Element toElement() {
- System.out.println("save map: " + name);
- Element root = new Element(isDungeon() ? "dungeon" : "world");
- Element header = new Element("header");
- header.setAttribute("uid", Short.toString(uid));
- header.addContent(new Element("name").setText(name));
- root.addContent(header);
- if (type == DUNGEON) {
- for (Integer level : zones.keySet()) {
- root.addContent(zones.get(level).toElement().setAttribute("l", level.toString()));
- }
- } else {
- RZone zone = zones.get(0);
- Element creatures = new Element("creatures");
- Element items = new Element("items");
- Element regions = new Element("regions");
- for (Renderable r : zone.getScene().getElements()) {
- Instance i = (Instance) r;
- Element element = i.toElement();
- element.detach();
- if (element.getName().equals("region")) {
- regions.addContent(element);
- } else if (element.getName().equals("creature")) {
- creatures.addContent(element);
- } else if (element.getName().equals("item")
- || element.getName().equals("door")
- || element.getName().equals("container")) {
- items.addContent(element);
- }
- }
- root.addContent(creatures);
- root.addContent(items);
- root.addContent(regions);
- }
-
- return root;
- }
-
- public void load() {
- if (uids == null) { // avoid loading map twice
- uids = new ArrayList();
- try {
- String file = Editor.getStore().getMod(path[0]).getPath()[0];
- Element root =
- Editor.files.getFile(new XMLTranslator(), file, "maps", id + ".xml").getRootElement();
-
- if (root.getName().equals("world")) {
- uids.addAll(zones.get(0).load(root));
- } else if (root.getName().equals("dungeon")) {
- for (Element level : root.getChildren("level")) {
- uids.addAll(zones.get(Integer.parseInt(level.getAttributeValue("l"))).load(level));
- }
- } else {
- System.out.println("fout in EditableMap.load(" + id + ")");
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * This method removes a zone from this map.
- *
- * @param level the zone to remove
- */
- public void removeZone(int level) {
- for (Renderable r : zones.get(level).getScene().getElements()) {
- Instance instance = (Instance) r;
- if (instance instanceof IObject) { // remove uids
- uids.remove(Integer.parseInt(instance.toElement().getAttributeValue("uid")));
- if (instance.toElement().getName().equals("container")) { // remove container contents
- for (Element e : instance.toElement().getChildren()) {
- uids.remove(Integer.parseInt(e.getAttributeValue("uid")));
- }
- }
- }
- }
- zones.remove(level);
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2013 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.editor.resources;
+
+import java.util.*;
+import neon.editor.Editor;
+import neon.editor.maps.*;
+import neon.maps.model.DungeonModel;
+import neon.maps.model.WorldModel;
+import neon.resources.RData;
+import neon.resources.RDungeonTheme;
+import neon.resources.RScript;
+import neon.systems.files.XMLTranslator;
+import neon.ui.graphics.Renderable;
+import org.jdom2.*;
+
+/*
+ * life cycle of a map:
+ * A. existing map:
+ * 1. load map
+ * 2. load zones
+ * B. new map:
+ * a. dungeon
+ * b. random dungeon
+ * c. outdoor
+ */
+public class RMap extends RData {
+ // id van map = path
+ public static final boolean DUNGEON = true;
+ public HashMap zones = new HashMap();
+ public RDungeonTheme theme;
+ public short uid;
+ private boolean type;
+ private ArrayList uids;
+
+ // for already existing maps during loadMod
+ public RMap(String id, Element properties, String... path) {
+ super(id, path);
+ uid = Short.parseShort(properties.getChild("header").getAttributeValue("uid"));
+ name = properties.getChild("header").getChildText("name");
+ type = properties.getName().equals("dungeon");
+
+ if (type == DUNGEON) {
+ if (properties.getChild("header").getAttribute("theme") != null) {
+ theme =
+ (RDungeonTheme)
+ Editor.resources.getResource(
+ properties.getChild("header").getAttributeValue("theme"), "theme");
+ } else {
+ for (Element zone : properties.getChildren("level")) {
+ zones.put(Integer.parseInt(zone.getAttributeValue("l")), new RZone(zone, this, path));
+ }
+ }
+ } else {
+ zones.put(0, new RZone(properties, this, path));
+ }
+ }
+
+ // for new maps to be created
+ public RMap(short uid, String mod, MapDialog.Properties props) {
+ super(props.getID(), mod);
+ this.uid = uid;
+ type = props.isDungeon();
+ name = props.getName();
+
+ if (!props.isDungeon()) { // always set zone and base region for outdoor
+ Element region = new Element("region");
+ region.setAttribute("x", "0");
+ region.setAttribute("y", "0");
+ region.setAttribute("w", Integer.toString(props.getWidth()));
+ region.setAttribute("h", Integer.toString(props.getHeight()));
+ region.setAttribute("text", props.getTerrain());
+ region.setAttribute("l", "0");
+ Instance ri = new IRegion(region);
+ RZone zone = new RZone(name, mod, ri, this);
+ zones.put(0, zone);
+ }
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public boolean isDungeon() {
+ return type;
+ }
+
+ public RZone getZone(int index) {
+ if (zones.isEmpty()) {
+ load();
+ }
+ return zones.get(index);
+ }
+
+ public int getZone(RZone zone) {
+ if (zones.isEmpty()) {
+ load();
+ }
+
+ for (Integer i : zones.keySet()) {
+ if (zones.get(i) == zone) {
+ return i;
+ }
+ }
+ return 0;
+ }
+
+ public short getUID() {
+ return uid;
+ }
+
+ public String toString() {
+ return name;
+ }
+
+ // also remove objects from tree if needed!!!
+ public void removeObjectUID(int uid) {
+ uids.remove((Integer) uid); // because remove(int) removes the int'th value
+ }
+
+ // don't forget to add objects to the tree!!!
+ public int createUID(Element e) {
+ int hash = e.hashCode();
+ while (uids.contains(hash)) {
+ hash++;
+ }
+ uids.add(hash);
+ return hash;
+ }
+
+ public Element toElement() {
+ System.out.println("save map: " + name);
+ Element root = new Element(isDungeon() ? "dungeon" : "world");
+ Element header = new Element("header");
+ header.setAttribute("uid", Short.toString(uid));
+ header.addContent(new Element("name").setText(name));
+ root.addContent(header);
+ if (type == DUNGEON) {
+ for (Integer level : zones.keySet()) {
+ root.addContent(zones.get(level).toElement().setAttribute("l", level.toString()));
+ }
+ } else {
+ RZone zone = zones.get(0);
+ Element creatures = new Element("creatures");
+ Element items = new Element("items");
+ Element regions = new Element("regions");
+ for (Renderable r : zone.getScene().getElements()) {
+ Instance i = (Instance) r;
+ Element element = i.toElement();
+ element.detach();
+ if (element.getName().equals("region")) {
+ regions.addContent(element);
+ } else if (element.getName().equals("creature")) {
+ creatures.addContent(element);
+ } else if (element.getName().equals("item")
+ || element.getName().equals("door")
+ || element.getName().equals("container")) {
+ items.addContent(element);
+ }
+ }
+ root.addContent(creatures);
+ root.addContent(items);
+ root.addContent(regions);
+ }
+
+ return root;
+ }
+
+ /**
+ * Converts this map to a WorldModel for Jackson XML serialization.
+ *
+ * @return WorldModel representation
+ */
+ public WorldModel toWorldModel() {
+ WorldModel model = new WorldModel();
+
+ // Header
+ model.header = new WorldModel.Header();
+ model.header.uid = uid;
+ model.header.name = name;
+
+ RZone zone = zones.get(0);
+ for (Renderable r : zone.getScene().getElements()) {
+ Instance instance = (Instance) r;
+
+ if (instance instanceof IRegion) {
+ model.regions.add(convertRegion((IRegion) instance));
+ } else if (instance instanceof IObject) {
+ IObject obj = (IObject) instance;
+ if (instance instanceof IDoor) {
+ model.items.doors.add(convertDoor((IDoor) instance));
+ } else if (instance instanceof IContainer) {
+ model.items.containers.add(convertContainer((IContainer) instance));
+ } else {
+ model.items.items.add(convertItem(obj));
+ }
+ } else if (instance instanceof IPerson) {
+ model.creatures.add(convertCreature((IPerson) instance));
+ }
+ }
+
+ return model;
+ }
+
+ /**
+ * Converts this map to a DungeonModel for Jackson XML serialization.
+ *
+ * @return DungeonModel representation
+ */
+ public DungeonModel toDungeonModel() {
+ DungeonModel model = new DungeonModel();
+
+ // Header
+ model.header = new WorldModel.Header();
+ model.header.uid = uid;
+ model.header.name = name;
+
+ // Levels
+ for (Integer levelNum : zones.keySet()) {
+ RZone zone = zones.get(levelNum);
+ DungeonModel.Level level = new DungeonModel.Level();
+ level.l = levelNum;
+ level.name = zone.name;
+
+ if (zone.theme != null) {
+ level.theme = zone.theme.id;
+ // Theme-based zones don't have explicit content
+ } else {
+ // Explicit zone content
+ for (Renderable r : zone.getScene().getElements()) {
+ Instance instance = (Instance) r;
+
+ if (instance instanceof IRegion) {
+ level.regions.add(convertRegion((IRegion) instance));
+ } else if (instance instanceof IObject) {
+ IObject obj = (IObject) instance;
+ if (instance instanceof IDoor) {
+ level.items.doors.add(convertDoor((IDoor) instance));
+ } else if (instance instanceof IContainer) {
+ level.items.containers.add(convertContainer((IContainer) instance));
+ } else {
+ level.items.items.add(convertItem(obj));
+ }
+ } else if (instance instanceof IPerson) {
+ level.creatures.add(convertCreature((IPerson) instance));
+ }
+ }
+ }
+
+ model.levels.add(level);
+ }
+
+ return model;
+ }
+
+ private WorldModel.RegionData convertRegion(IRegion region) {
+ WorldModel.RegionData data = new WorldModel.RegionData();
+ data.x = region.x;
+ data.y = region.y;
+ data.w = region.width;
+ data.h = region.height;
+ data.l = (byte) region.z;
+ data.text = region.resource.id;
+ if (region.theme != null) {
+ data.random = region.theme.id;
+ }
+ if (region.label != null && !region.label.isEmpty()) {
+ data.label = region.label;
+ }
+ for (RScript script : region.scripts) {
+ WorldModel.RegionData.ScriptReference scriptRef = new WorldModel.RegionData.ScriptReference();
+ scriptRef.id = script.id;
+ data.scripts.add(scriptRef);
+ }
+ return data;
+ }
+
+ private WorldModel.CreaturePlacement convertCreature(IPerson person) {
+ WorldModel.CreaturePlacement cp = new WorldModel.CreaturePlacement();
+ cp.x = person.x;
+ cp.y = person.y;
+ cp.id = person.resource.id;
+ cp.uid = person.uid;
+ return cp;
+ }
+
+ private WorldModel.ItemPlacement convertItem(IObject obj) {
+ WorldModel.ItemPlacement ip = new WorldModel.ItemPlacement();
+ ip.x = obj.x;
+ ip.y = obj.y;
+ ip.id = obj.resource.id;
+ ip.uid = obj.uid;
+ return ip;
+ }
+
+ private WorldModel.DoorPlacement convertDoor(IDoor door) {
+ WorldModel.DoorPlacement dp = new WorldModel.DoorPlacement();
+ dp.x = door.x;
+ dp.y = door.y;
+ dp.id = door.resource.id;
+ dp.uid = door.uid;
+
+ if (door.state != null) {
+ dp.state = door.state.toString().toLowerCase();
+ }
+ if (door.lock > 0) {
+ dp.lock = door.lock;
+ }
+ if (door.key != null) {
+ dp.key = door.key.id;
+ }
+ if (door.trap > 0) {
+ dp.trap = door.trap;
+ }
+ if (door.spell != null) {
+ dp.spell = door.spell.id;
+ }
+
+ // Destination
+ if (door.destMap != null || door.destTheme != null) {
+ dp.destination = new WorldModel.DoorPlacement.Destination();
+ if (door.destTheme != null) {
+ dp.destination.theme = door.destTheme.id;
+ } else {
+ if (door.destPos != null) {
+ dp.destination.x = door.destPos.x;
+ dp.destination.y = door.destPos.y;
+ }
+ if (door.destZone != null && door.destMap != null) {
+ dp.destination.z = door.destMap.getZone(door.destZone);
+ }
+ if (door.destMap != null) {
+ dp.destination.map = (int) door.destMap.uid;
+ }
+ }
+ if (door.text != null && !door.text.isEmpty()) {
+ dp.destination.sign = door.text;
+ }
+ }
+
+ return dp;
+ }
+
+ private WorldModel.ContainerPlacement convertContainer(IContainer container) {
+ WorldModel.ContainerPlacement cp = new WorldModel.ContainerPlacement();
+ cp.x = container.x;
+ cp.y = container.y;
+ cp.id = container.resource.id;
+ cp.uid = container.uid;
+
+ if (container.lock > 0) {
+ cp.lock = container.lock;
+ }
+ if (container.key != null) {
+ cp.key = container.key.id;
+ }
+ if (container.trap > 0) {
+ cp.trap = container.trap;
+ }
+ if (container.spell != null) {
+ cp.spell = container.spell.id;
+ }
+
+ // Contents
+ for (IObject item : container.contents) {
+ WorldModel.ContainerPlacement.ContainerItem ci =
+ new WorldModel.ContainerPlacement.ContainerItem();
+ ci.id = item.resource.id;
+ ci.uid = item.uid;
+ cp.contents.add(ci);
+ }
+
+ return cp;
+ }
+
+ public void load() {
+ if (uids == null) { // avoid loading map twice
+ uids = new ArrayList();
+ try {
+ String file = Editor.getStore().getMod(path[0]).getPath()[0];
+ Element root =
+ Editor.files.getFile(new XMLTranslator(), file, "maps", id + ".xml").getRootElement();
+
+ if (root.getName().equals("world")) {
+ uids.addAll(zones.get(0).load(root));
+ } else if (root.getName().equals("dungeon")) {
+ for (Element level : root.getChildren("level")) {
+ uids.addAll(zones.get(Integer.parseInt(level.getAttributeValue("l"))).load(level));
+ }
+ } else {
+ System.out.println("fout in EditableMap.load(" + id + ")");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * This method removes a zone from this map.
+ *
+ * @param level the zone to remove
+ */
+ public void removeZone(int level) {
+ for (Renderable r : zones.get(level).getScene().getElements()) {
+ Instance instance = (Instance) r;
+ if (instance instanceof IObject) { // remove uids
+ uids.remove(Integer.parseInt(instance.toElement().getAttributeValue("uid")));
+ if (instance.toElement().getName().equals("container")) { // remove container contents
+ for (Element e : instance.toElement().getChildren()) {
+ uids.remove(Integer.parseInt(e.getAttributeValue("uid")));
+ }
+ }
+ }
+ }
+ zones.remove(level);
+ }
+}
diff --git a/src/main/java/neon/entities/UIDStore.java b/src/main/java/neon/entities/UIDStore.java
index 88bddad..8412ac2 100644
--- a/src/main/java/neon/entities/UIDStore.java
+++ b/src/main/java/neon/entities/UIDStore.java
@@ -22,6 +22,7 @@
import com.google.common.collect.HashBiMap;
import java.io.*;
import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
import neon.maps.services.EntityStore;
import org.h2.mvstore.MVStore;
@@ -32,6 +33,7 @@
*
* @author mdriesen
*/
+@Slf4j
public class UIDStore implements EntityStore, Closeable {
// dummy uid for objects that don't actually exist
public static final long DUMMY = 0;
@@ -73,8 +75,18 @@ public short getModUID(String name) {
return mod.uid;
}
}
- System.out.println("Mod " + name + " not found");
- return 0;
+ throw new RuntimeException("Mod " + name + " not found");
+ // System.out.println("Mod " + name + " not found");
+ // return 0;
+ }
+
+ public boolean isModUIDLoaded(String name) {
+ for (Mod mod : mods.values()) {
+ if (mod.name.equals(name)) {
+ return true;
+ }
+ }
+ return false;
}
/**
@@ -149,6 +161,10 @@ public String[] getMapPath(int uid) {
* @return the uid of the given map
*/
public int getMapUID(String... path) {
+ var uid = maps.inverse().get(toString(path));
+ if (uid == null) {
+ log.warn("{} doesn't have uid", (Object) path);
+ }
return maps.inverse().get(toString(path));
}
diff --git a/src/main/java/neon/maps/Atlas.java b/src/main/java/neon/maps/Atlas.java
index 5921c9a..4099ce0 100644
--- a/src/main/java/neon/maps/Atlas.java
+++ b/src/main/java/neon/maps/Atlas.java
@@ -51,6 +51,7 @@ public class Atlas implements Closeable, MapAtlas {
private final ResourceProvider resourceProvider;
private final QuestProvider questProvider;
private final ZoneActivator zoneActivator;
+ private final MapLoader mapLoader;
/**
* Initializes this {@code Atlas} with the given {@code FileSystem} and cache path. The cache is
@@ -98,17 +99,17 @@ public Atlas(
// files.delete(path);
// String fileName = files.getFullPath(path);
// log.warn("Creating new MVStore at {}", fileName);
-
+ this.mapLoader = new MapLoader(this.entityStore, this.resourceProvider);
// db = MVStore.open(fileName);
maps = atlasStore.openMap("maps");
}
private static MVStore getMVStore(FileSystem files, String path) {
files.delete(path);
- String fileName = files.getFullPath(path);
- log.warn("Creating new MVStore at {}", fileName);
- return MVStore.open(fileName);
+ log.warn("Creating new MVStore at {}", path);
+
+ return MVStore.open(path);
}
/**
@@ -152,13 +153,22 @@ public int getCurrentZoneIndex() {
@Override
public Map getMap(int uid) {
if (!maps.containsKey(uid)) {
- Map map = MapLoader.loadMap(entityStore.getMapPath(uid), uid, files);
+ if (entityStore.getMapPath(uid) == null) {
+ throw new RuntimeException(String.format("No existing mappath for uid %d", uid));
+ }
+ Map map = mapLoader.load(entityStore.getMapPath(uid), uid, files);
System.out.println("Loaded map " + map.toString());
maps.put(uid, map);
}
return maps.get(uid);
}
+ @Override
+ public Map getMap(int uid, String... path) {
+ Map map = mapLoader.load(path, uid, files);
+ return map;
+ }
+
/**
* Sets the current zone.
*
diff --git a/src/main/java/neon/maps/MapLoader.java b/src/main/java/neon/maps/MapLoader.java
index 51f51e3..399225f 100644
--- a/src/main/java/neon/maps/MapLoader.java
+++ b/src/main/java/neon/maps/MapLoader.java
@@ -19,6 +19,8 @@
package neon.maps;
import java.awt.Point;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import neon.core.*;
import neon.entities.Container;
import neon.entities.Creature;
@@ -28,6 +30,8 @@
import neon.entities.UIDStore;
import neon.entities.components.Enchantment;
import neon.entities.components.Lock;
+import neon.maps.model.DungeonModel;
+import neon.maps.model.WorldModel;
import neon.maps.services.EngineEntityStore;
import neon.maps.services.EngineResourceProvider;
import neon.maps.services.EntityStore;
@@ -39,8 +43,11 @@
import neon.resources.RTerrain;
import neon.resources.RZoneTheme;
import neon.systems.files.FileSystem;
+import neon.systems.files.JacksonMapper;
import neon.systems.files.XMLTranslator;
import org.jdom2.*;
+import org.jdom2.output.XMLOutputter;
+import org.jetbrains.annotations.NotNull;
/**
* This class loads a map from an xml file.
@@ -86,20 +93,6 @@ private static MapLoader createDefault() {
return new MapLoader(new EngineEntityStore(), new EngineResourceProvider());
}
- /**
- * Returns a map described in an xml file with the given name.
- *
- * @param path the pathname of a map file
- * @param uid the unique identifier of this map
- * @param files the file system
- * @return the Map described by the map file
- * @deprecated Use instance method {@link #load(String[], int, FileSystem)} instead
- */
- @Deprecated
- public static Map loadMap(String[] path, int uid, FileSystem files) {
- return createDefault().load(path, uid, files);
- }
-
/**
* Returns a map described in an xml file with the given name (instance method).
*
@@ -108,10 +101,15 @@ public static Map loadMap(String[] path, int uid, FileSystem files) {
* @param files the file system
* @return the Map described by the map file
*/
- public Map load(String[] path, int uid, FileSystem files) {
+ public Map load(@NotNull String[] path, int uid, FileSystem files) {
+ // For now, use JDOM to determine type, then build models
+ // In the future, FileSystem can provide InputStream directly
+
Document doc = files.getFile(new XMLTranslator(), path);
Element root = doc.getRootElement();
+
if (root.getName().equals("world")) {
+
return loadWorld(root, uid);
} else {
return loadDungeon(root, uid);
@@ -138,39 +136,41 @@ public static Dungeon loadDungeon(String theme) {
}
private World loadWorld(Element root, int uid) {
- World world = new World(root.getChild("header").getChildText("name"), uid);
- loadZone(root, world, 0, uid); // outdoor has only 1 zone, namely 0
- return world;
+ try {
+ // Convert JDOM Element to XML string
+ XMLOutputter outputter = new XMLOutputter();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ outputter.output(root, out);
+
+ // Parse with Jackson
+ JacksonMapper mapper = new JacksonMapper();
+ ByteArrayInputStream input = new ByteArrayInputStream(out.toByteArray());
+ WorldModel model = mapper.fromXml(input, WorldModel.class);
+
+ // Build World from model
+ return buildWorldFromModel(model, uid);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to load world map", e);
+ }
}
private Dungeon loadDungeon(Element root, int uid) {
- if (root.getChild("header").getAttribute("theme") != null) {
- String name = root.getChild("header").getChildText("name");
- return loadThemedDungeon(name, root.getChild("header").getAttributeValue("theme"), uid);
- }
-
- Dungeon map = new Dungeon(root.getChild("header").getChildText("name"), uid);
-
- for (Element l : root.getChildren("level")) {
- int level = Integer.parseInt(l.getAttributeValue("l"));
- String name = l.getAttributeValue("name");
- if (l.getAttribute("theme") != null) {
- RZoneTheme theme =
- (RZoneTheme) resourceProvider.getResource(l.getAttributeValue("theme"), "theme");
- map.addZone(level, name, theme);
- if (l.getAttribute("out") != null) {
- String[] connections = l.getAttributeValue("out").split(",");
- for (String connection : connections) {
- map.addConnection(level, Integer.parseInt(connection));
- }
- }
- } else {
- map.addZone(level, name);
- loadZone(l, map, level, uid);
- }
+ try {
+ // Convert JDOM Element to XML string
+ XMLOutputter outputter = new XMLOutputter();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ outputter.output(root, out);
+
+ // Parse with Jackson
+ JacksonMapper mapper = new JacksonMapper();
+ ByteArrayInputStream input = new ByteArrayInputStream(out.toByteArray());
+ DungeonModel model = mapper.fromXml(input, DungeonModel.class);
+
+ // Build Dungeon from model
+ return buildDungeonFromModel(model, uid);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to load dungeon map", e);
}
-
- return map;
}
private Dungeon loadThemedDungeon(String name, String dungeon, int uid) {
@@ -203,6 +203,294 @@ private Dungeon loadThemedDungeon(String name, String dungeon, int uid) {
return map;
}
+ /**
+ * Builds a World from a WorldModel (Jackson-parsed structure).
+ *
+ * @param model the WorldModel from Jackson XML parsing
+ * @param uid the unique identifier for this map
+ * @return the constructed World
+ */
+ private World buildWorldFromModel(WorldModel model, int uid) {
+ World world = new World(model.header.name, uid);
+ Zone zone = world.getZone(0); // outdoor maps have only zone 0
+
+ // Add regions
+ for (WorldModel.RegionData regionData : model.regions) {
+ Region region = buildRegionFromModel(regionData);
+ zone.addRegion(region);
+ }
+
+ // Add creatures
+ for (WorldModel.CreaturePlacement cp : model.creatures) {
+ long creatureUID = UIDStore.getObjectUID(uid, cp.uid);
+ Creature creature = EntityFactory.getCreature(cp.id, cp.x, cp.y, creatureUID);
+ entityStore.addEntity(creature);
+ zone.addCreature(creature);
+ }
+
+ // Add items (simple items)
+ for (WorldModel.ItemPlacement ip : model.items.items) {
+ long itemUID = UIDStore.getObjectUID(uid, ip.uid);
+ Item item = EntityFactory.getItem(ip.id, ip.x, ip.y, itemUID);
+ entityStore.addEntity(item);
+ zone.addItem(item);
+ }
+
+ // Add doors
+ for (WorldModel.DoorPlacement dp : model.items.doors) {
+ long doorUID = UIDStore.getObjectUID(uid, dp.uid);
+ Door door = buildDoorFromModel(dp, uid, doorUID);
+ entityStore.addEntity(door);
+ zone.addItem(door);
+ }
+
+ // Add containers
+ for (WorldModel.ContainerPlacement cp : model.items.containers) {
+ long containerUID = UIDStore.getObjectUID(uid, cp.uid);
+ Container container = buildContainerFromModel(cp, uid, containerUID);
+ entityStore.addEntity(container);
+ zone.addItem(container);
+ }
+
+ return world;
+ }
+
+ /**
+ * Builds a Dungeon from a DungeonModel (Jackson-parsed structure).
+ *
+ * @param model the DungeonModel from Jackson XML parsing
+ * @param uid the unique identifier for this map
+ * @return the constructed Dungeon
+ */
+ private Dungeon buildDungeonFromModel(DungeonModel model, int uid) {
+ // Check for themed dungeon
+ if (model.header.theme != null) {
+ return loadThemedDungeon(model.header.name, model.header.theme, uid);
+ }
+
+ Dungeon dungeon = new Dungeon(model.header.name, uid);
+
+ for (DungeonModel.Level levelData : model.levels) {
+ int level = levelData.l;
+ String name = levelData.name;
+
+ if (levelData.theme != null) {
+ // Themed zone - add theme reference
+ RZoneTheme theme = (RZoneTheme) resourceProvider.getResource(levelData.theme, "theme");
+ dungeon.addZone(level, name, theme);
+
+ if (levelData.out != null) {
+ String[] connections = levelData.out.split(",");
+ for (String connection : connections) {
+ dungeon.addConnection(level, Integer.parseInt(connection.trim()));
+ }
+ }
+ } else {
+ // Explicit zone - load all content
+ dungeon.addZone(level, name);
+ Zone zone = dungeon.getZone(level);
+
+ // Add regions
+ for (WorldModel.RegionData regionData : levelData.regions) {
+ zone.addRegion(buildRegionFromModel(regionData));
+ }
+
+ // Add creatures
+ for (WorldModel.CreaturePlacement cp : levelData.creatures) {
+ long creatureUID = UIDStore.getObjectUID(uid, cp.uid);
+ Creature creature = EntityFactory.getCreature(cp.id, cp.x, cp.y, creatureUID);
+ entityStore.addEntity(creature);
+ zone.addCreature(creature);
+ }
+
+ // Add items
+ for (WorldModel.ItemPlacement ip : levelData.items.items) {
+ long itemUID = UIDStore.getObjectUID(uid, ip.uid);
+ Item item = EntityFactory.getItem(ip.id, ip.x, ip.y, itemUID);
+ entityStore.addEntity(item);
+ zone.addItem(item);
+ }
+
+ // Add doors
+ for (WorldModel.DoorPlacement dp : levelData.items.doors) {
+ long doorUID = UIDStore.getObjectUID(uid, dp.uid);
+ Door door = buildDoorFromModel(dp, uid, doorUID);
+ entityStore.addEntity(door);
+ zone.addItem(door);
+ }
+
+ // Add containers
+ for (WorldModel.ContainerPlacement cp : levelData.items.containers) {
+ long containerUID = UIDStore.getObjectUID(uid, cp.uid);
+ Container container = buildContainerFromModel(cp, uid, containerUID);
+ entityStore.addEntity(container);
+ zone.addItem(container);
+ }
+ }
+ }
+
+ return dungeon;
+ }
+
+ /**
+ * Builds a Region from RegionData model.
+ *
+ * @param regionData the region data from model
+ * @return the constructed Region
+ */
+ private Region buildRegionFromModel(WorldModel.RegionData regionData) {
+ RTerrain terrain = (RTerrain) resourceProvider.getResource(regionData.text, "terrain");
+ RRegionTheme theme = (RRegionTheme) resourceProvider.getResource(regionData.random, "theme");
+
+ Region region =
+ new Region(
+ regionData.text,
+ regionData.x,
+ regionData.y,
+ regionData.w,
+ regionData.h,
+ theme,
+ regionData.l,
+ terrain);
+
+ region.setLabel(regionData.label);
+
+ for (WorldModel.RegionData.ScriptReference script : regionData.scripts) {
+ region.addScript(script.id, false);
+ }
+
+ return region;
+ }
+
+ /**
+ * Builds a Door from DoorPlacement model.
+ *
+ * @param doorData the door placement data
+ * @param mapUID the map UID
+ * @param doorUID the door entity UID
+ * @return the constructed Door
+ */
+ private Door buildDoorFromModel(WorldModel.DoorPlacement doorData, int mapUID, long doorUID) {
+ Door door = (Door) EntityFactory.getItem(doorData.id, doorData.x, doorData.y, doorUID);
+
+ // Lock
+ if (doorData.lock != null) {
+ door.lock.setLockDC(doorData.lock);
+ }
+
+ // Key
+ if (doorData.key != null) {
+ RItem key = (RItem) resourceProvider.getResource(doorData.key);
+ door.lock.setKey(key);
+ }
+
+ // State
+ if (doorData.state != null) {
+ if (doorData.state.equals("locked")) {
+ if (doorData.lock != null && doorData.lock > 0) {
+ door.lock.setState(Lock.LOCKED);
+ } else {
+ door.lock.setState(Lock.CLOSED);
+ }
+ } else if (doorData.state.equals("closed")) {
+ door.lock.setState(Lock.CLOSED);
+ }
+ }
+
+ // Trap
+ if (doorData.trap != null) {
+ door.trap.setTrapDC(doorData.trap);
+ }
+
+ // Spell
+ if (doorData.spell != null) {
+ RSpell.Enchantment enchantment =
+ (RSpell.Enchantment) resourceProvider.getResource(doorData.spell, "magic");
+ door.setMagicComponent(new Enchantment(enchantment, 0, door.getUID()));
+ }
+
+ // Destination
+ if (doorData.destination != null) {
+ WorldModel.DoorPlacement.Destination dest = doorData.destination;
+ Point destPos = null;
+ int destLevel = 0;
+ int destMapUID = 0;
+
+ if (dest.x != null && dest.y != null) {
+ destPos = new Point(dest.x, dest.y);
+ }
+ if (dest.z != null) {
+ destLevel = dest.z;
+ }
+ if (dest.map != null) {
+ destMapUID = (mapUID & 0xFFFF0000) + dest.map;
+ }
+
+ door.portal.setDestination(destPos, destLevel, destMapUID);
+ door.portal.setDestTheme(dest.theme);
+ door.setSign(dest.sign);
+ }
+
+ return door;
+ }
+
+ /**
+ * Builds a Container from ContainerPlacement model.
+ *
+ * @param containerData the container placement data
+ * @param mapUID the map UID
+ * @param containerUID the container entity UID
+ * @return the constructed Container
+ */
+ private Container buildContainerFromModel(
+ WorldModel.ContainerPlacement containerData, int mapUID, long containerUID) {
+ Container container =
+ (Container)
+ EntityFactory.getItem(containerData.id, containerData.x, containerData.y, containerUID);
+
+ // Lock
+ if (containerData.lock != null) {
+ container.lock.setLockDC(containerData.lock);
+ container.lock.setState(Lock.LOCKED);
+ }
+
+ // Key
+ if (containerData.key != null) {
+ RItem key = (RItem) resourceProvider.getResource(containerData.key);
+ container.lock.setKey(key);
+ }
+
+ // Trap
+ if (containerData.trap != null) {
+ container.trap.setTrapDC(containerData.trap);
+ }
+
+ // Spell
+ if (containerData.spell != null) {
+ RSpell.Enchantment enchantment =
+ (RSpell.Enchantment) resourceProvider.getResource(containerData.spell, "magic");
+ container.setMagicComponent(new Enchantment(enchantment, 0, container.getUID()));
+ }
+
+ // Contents
+ if (!containerData.contents.isEmpty()) {
+ for (WorldModel.ContainerPlacement.ContainerItem contentData : containerData.contents) {
+ long contentUID = UIDStore.getObjectUID(mapUID, contentData.uid);
+ entityStore.addEntity(EntityFactory.getItem(contentData.id, contentUID));
+ container.addItem(contentUID);
+ }
+ } else {
+ // Default items from resource definition
+ for (String itemId : ((RItem.Container) container.resource).contents) {
+ Item item = EntityFactory.getItem(itemId, entityStore.createNewEntityUID());
+ entityStore.addEntity(item);
+ container.addItem(item.getUID());
+ }
+ }
+
+ return container;
+ }
+
private void loadZone(Element root, Map map, int l, int uid) {
for (Element region : root.getChild("regions").getChildren()) { // load regions
map.getZone(l).addRegion(loadRegion(region));
diff --git a/src/main/java/neon/maps/generators/DungeonGenerator.java b/src/main/java/neon/maps/generators/DungeonGenerator.java
index e6dce6c..088010e 100644
--- a/src/main/java/neon/maps/generators/DungeonGenerator.java
+++ b/src/main/java/neon/maps/generators/DungeonGenerator.java
@@ -372,20 +372,20 @@ int[][] generateBaseTiles(String type, int width, int height) {
return tiles;
}
- private void generateFeatures(Collection features, double ratio) {
+ private void generateFeatures(Collection features, double ratio) {
int width = terrain.length;
int height = terrain[0].length;
- for (Object[] feature : features) {
- int s = (int) (feature[2]);
- String t = feature[0].toString();
- int n = (int) feature[3] * 100;
+ for (RZoneTheme.Feature feature : features) {
+ int s = feature.s;
+ String t = feature.t;
+ int n = feature.n * 100;
if (n > 100) {
n = mapUtils.random(0, (int) (n * ratio / 100));
} else {
n = (mapUtils.random(0, (int) (n * ratio)) > 50) ? 1 : 0;
}
- if (feature[1].equals("lake")) { // large patch that just overwrites everything
+ if (feature.value.equals("lake")) { // large patch that just overwrites everything
int size = 100 / s;
ArrayList lakes =
blocksGenerator.createSparseRectangles(
@@ -393,7 +393,7 @@ private void generateFeatures(Collection features, double ratio) {
for (Rectangle r : lakes) { // place lake
featureGenerator.generateLake(terrain, t, r);
}
- } else if (feature[1].equals("patch")) { // patch that only overwrites floor tiles
+ } else if (feature.value.equals("patch")) { // patch that only overwrites floor tiles
// place patches
ArrayList patches =
blocksGenerator.createSparseRectangles(width, height, s, s, 2, n);
@@ -407,7 +407,7 @@ private void generateFeatures(Collection features, double ratio) {
}
}
}
- } else if (feature[1].equals("chunk")) { // patch that only overwrites wall tiles
+ } else if (feature.value.equals("chunk")) { // patch that only overwrites wall tiles
ArrayList chunks =
blocksGenerator.createSparseRectangles(width, height, s, s, 2, n);
for (Rectangle chunk : chunks) {
@@ -422,7 +422,7 @@ private void generateFeatures(Collection features, double ratio) {
}
}
}
- } else if (feature[1].equals("stain")) { // patch that only overwrites exposed wall tiles
+ } else if (feature.value.equals("stain")) { // patch that only overwrites exposed wall tiles
ArrayList stains =
blocksGenerator.createSparseRectangles(width, height, s, s, 2, n);
for (Rectangle stain : stains) {
@@ -438,7 +438,7 @@ && exposed(tiles, x, y)) {
}
}
}
- } else if (feature[1].equals("river")) {
+ } else if (feature.value.equals("river")) {
while (n-- > 0) { // apparently first >, then --
featureGenerator.generateRiver(terrain, tiles, t, s);
}
diff --git a/src/main/java/neon/maps/generators/TownGenerator.java b/src/main/java/neon/maps/generators/TownGenerator.java
index fb52a50..cae2952 100644
--- a/src/main/java/neon/maps/generators/TownGenerator.java
+++ b/src/main/java/neon/maps/generators/TownGenerator.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import neon.entities.Door;
import neon.entities.EntityFactory;
+import neon.maps.MapUtils;
import neon.maps.Region;
import neon.maps.Zone;
import neon.maps.services.EntityStore;
@@ -38,18 +39,36 @@ public class TownGenerator {
private final Zone zone;
private final EntityStore entityStore;
private final ResourceProvider resourceProvider;
+ private final MapUtils mapUtils;
/**
- * Creates a town generator with dependency injection.
+ * Creates a town generator with dependency injection. Uses default (non-deterministic) random
+ * number generation.
*
* @param zone the zone to generate
* @param entityStore the entity store service
* @param resourceProvider the resource provider service
*/
public TownGenerator(Zone zone, EntityStore entityStore, ResourceProvider resourceProvider) {
+ this(zone, entityStore, resourceProvider, new MapUtils());
+ }
+
+ /**
+ * Creates a town generator with dependency injection and custom random sources for deterministic
+ * testing.
+ *
+ * @param zone the zone to generate
+ * @param entityStore the entity store service
+ * @param resourceProvider the resource provider service
+ * @param mapUtils the map utilities with configured random source
+ * @param dice the dice roller with configured random source
+ */
+ public TownGenerator(
+ Zone zone, EntityStore entityStore, ResourceProvider resourceProvider, MapUtils mapUtils) {
this.zone = zone;
this.entityStore = entityStore;
this.resourceProvider = resourceProvider;
+ this.mapUtils = mapUtils;
}
/**
@@ -96,7 +115,7 @@ private void makeDoor(Region r, RRegionTheme theme) {
int x = 0, y = 0;
y =
- switch ((int) (Math.random() * 4)) {
+ switch (mapUtils.random(0, 3)) {
case 0 -> {
x = r.getX() + 1;
yield r.getY();
diff --git a/src/main/java/neon/maps/generators/WildernessGenerator.java b/src/main/java/neon/maps/generators/WildernessGenerator.java
index f2ec2f5..07b832b 100644
--- a/src/main/java/neon/maps/generators/WildernessGenerator.java
+++ b/src/main/java/neon/maps/generators/WildernessGenerator.java
@@ -36,7 +36,6 @@
import neon.resources.RRegionTheme;
import neon.resources.RTerrain;
import neon.util.Dice;
-import org.jdom2.Element;
/**
* Generates a piece of wilderness. The following types are supported:
@@ -310,15 +309,15 @@ private void generateTerrain(int width, int height, RRegionTheme theme, String b
private void addFeatures(int width, int height, RRegionTheme theme) {
double ratio = (width * height) / 10000d;
- for (Element feature : theme.features) {
- int n = (int) Float.parseFloat(feature.getAttributeValue("n")) * 100;
+ for (RRegionTheme.Feature feature : theme.features) {
+ int n = (int) Float.parseFloat(feature.n) * 100;
if (n > 100) {
n = mapUtils.random(0, (int) (n * ratio / 100));
} else {
n = (mapUtils.random(0, (int) (n * ratio)) > 50) ? 1 : 0;
}
- if (feature.getText().equals("lake")) { // large patch that just overwrites everything
- int size = 100 / Integer.parseInt(feature.getAttributeValue("s"));
+ if (feature.value.equals("lake")) { // large patch that just overwrites everything
+ int size = 100 / Integer.parseInt(feature.s);
ArrayList lakes =
blocksGenerator.createSparseRectangles(
width, height, width / size, height / size, 2, n);
@@ -328,7 +327,7 @@ private void addFeatures(int width, int height, RRegionTheme theme) {
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
if (lake.contains(x, y)) {
- terrain[y + 1][x + 1] = feature.getAttributeValue("t");
+ terrain[y + 1][x + 1] = feature.t;
}
}
}
@@ -351,7 +350,13 @@ private void addCreatures(
Creature creature =
EntityFactory.getCreature(id, rx + x, ry + y, entityStore.createNewEntityUID());
RTerrain terrain = (RTerrain) resourceProvider.getResource(region, "terrain");
- if (terrain.modifier == Region.Modifier.SWIM && creature.species.habitat == Habitat.LAND) {
+ // Only spawn creatures if their habitat matches the terrain
+ // LAND creatures should NOT spawn in SWIM terrain
+ boolean isWaterTerrain = terrain.modifier == Region.Modifier.SWIM;
+ boolean isLandCreature = creature.species.habitat == Habitat.LAND;
+ boolean canSpawn = !(isWaterTerrain && isLandCreature);
+
+ if (canSpawn) {
entityStore.addEntity(creature);
zone.addCreature(creature);
}
@@ -554,7 +559,7 @@ private void addTerrain(int x, int y, int width, int height, String type) {
}
// from http://www.evilscience.co.uk/?p=53
- private boolean[][] generateIslands(int width, int height, int p, int n, int i) {
+ boolean[][] generateIslands(int width, int height, int p, int n, int i) {
boolean[][] map = new boolean[width][height];
for (int x = 0; x < width; x++) {
diff --git a/src/main/java/neon/maps/model/DungeonModel.java b/src/main/java/neon/maps/model/DungeonModel.java
new file mode 100644
index 0000000..db23cd3
--- /dev/null
+++ b/src/main/java/neon/maps/model/DungeonModel.java
@@ -0,0 +1,73 @@
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2026 - Peter Riewe
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.maps.model;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+import neon.maps.model.WorldModel.*; // Reuse inner classes from WorldModel
+
+/**
+ * Jackson model for dungeon map XML structure.
+ *
+ * This class represents the parsed XML structure of a dungeon map file. It is designed to
+ * separate XML parsing (Jackson's responsibility) from game object construction (MapLoader's
+ * responsibility).
+ *
+ * @author priewe
+ */
+@JacksonXmlRootElement(localName = "dungeon")
+public class DungeonModel {
+
+ @JacksonXmlProperty(localName = "header")
+ public Header header;
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "level")
+ public List levels = new ArrayList<>();
+
+ /** Dungeon level with creatures, items, and regions */
+ public static class Level {
+ @JacksonXmlProperty(isAttribute = true, localName = "name")
+ public String name;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "l")
+ public int l; // level number
+
+ @JacksonXmlProperty(isAttribute = true, localName = "theme")
+ public String theme; // optional theme for generation
+
+ @JacksonXmlProperty(isAttribute = true, localName = "out")
+ public String out; // comma-separated connections to other levels
+
+ @JacksonXmlElementWrapper(localName = "creatures")
+ @JacksonXmlProperty(localName = "creature")
+ public List creatures = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(localName = "items")
+ @JacksonXmlProperty(localName = "items")
+ public WorldModel.ItemsWrapper items = new WorldModel.ItemsWrapper();
+
+ @JacksonXmlElementWrapper(localName = "regions")
+ @JacksonXmlProperty(localName = "region")
+ public List regions = new ArrayList<>();
+ }
+}
diff --git a/src/main/java/neon/maps/model/WorldModel.java b/src/main/java/neon/maps/model/WorldModel.java
new file mode 100644
index 0000000..b56655c
--- /dev/null
+++ b/src/main/java/neon/maps/model/WorldModel.java
@@ -0,0 +1,218 @@
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2026 - Peter Riewe
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.maps.model;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Jackson model for world map XML structure.
+ *
+ * This class represents the parsed XML structure of a world map file. It is designed to separate
+ * XML parsing (Jackson's responsibility) from game object construction (MapLoader's
+ * responsibility).
+ *
+ * @author priewe
+ */
+@JacksonXmlRootElement(localName = "world")
+public class WorldModel {
+
+ @JacksonXmlProperty(localName = "header")
+ public Header header;
+
+ @JacksonXmlElementWrapper(localName = "creatures")
+ @JacksonXmlProperty(localName = "creature")
+ public List creatures = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(localName = "items")
+ @JacksonXmlProperty(localName = "items")
+ public ItemsWrapper items = new ItemsWrapper();
+
+ @JacksonXmlElementWrapper(localName = "regions")
+ @JacksonXmlProperty(localName = "region")
+ public List regions = new ArrayList<>();
+
+ /** Wrapper for all item types (items, doors, containers) */
+ public static class ItemsWrapper {
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "item")
+ public List items = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "door")
+ public List doors = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "container")
+ public List containers = new ArrayList<>();
+ }
+
+ /** Map header with name and UID */
+ public static class Header implements Serializable {
+ @JacksonXmlProperty(isAttribute = true, localName = "uid")
+ public int uid;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "theme")
+ public String theme; // optional for themed dungeons
+
+ @JacksonXmlProperty(localName = "name")
+ public String name;
+ }
+
+ /** Creature placement in the world */
+ public static class CreaturePlacement implements Serializable {
+ @JacksonXmlProperty(isAttribute = true, localName = "x")
+ public int x;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "y")
+ public int y;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "id")
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "uid")
+ public int uid;
+ }
+
+ /** Base class for item placement (can be item, door, or container) */
+ public static class ItemPlacement implements Serializable {
+ @JacksonXmlProperty(isAttribute = true, localName = "x")
+ public int x;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "y")
+ public int y;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "id")
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "uid")
+ public int uid;
+ }
+
+ /** Door placement with destination and state */
+ public static class DoorPlacement extends ItemPlacement {
+ @JacksonXmlProperty(isAttribute = true, localName = "state")
+ public String state; // open, closed, locked
+
+ @JacksonXmlProperty(isAttribute = true, localName = "lock")
+ public Integer lock; // lock difficulty (optional)
+
+ @JacksonXmlProperty(isAttribute = true, localName = "key")
+ public String key; // key item ID (optional)
+
+ @JacksonXmlProperty(isAttribute = true, localName = "trap")
+ public Integer trap; // trap difficulty (optional)
+
+ @JacksonXmlProperty(isAttribute = true, localName = "spell")
+ public String spell; // spell ID for trapped door (optional)
+
+ @JacksonXmlProperty(localName = "dest")
+ public Destination destination;
+
+ /** Door destination */
+ public static class Destination implements Serializable {
+ @JacksonXmlProperty(isAttribute = true, localName = "x")
+ public Integer x;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "y")
+ public Integer y;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "z")
+ public Integer z; // level/zone
+
+ @JacksonXmlProperty(isAttribute = true, localName = "map")
+ public Integer map; // map UID
+
+ @JacksonXmlProperty(isAttribute = true, localName = "theme")
+ public String theme; // themed dungeon
+
+ @JacksonXmlProperty(isAttribute = true, localName = "sign")
+ public String sign; // destination label
+ }
+ }
+
+ /** Container placement with contents */
+ public static class ContainerPlacement extends ItemPlacement {
+ @JacksonXmlProperty(isAttribute = true, localName = "lock")
+ public Integer lock; // lock difficulty (optional)
+
+ @JacksonXmlProperty(isAttribute = true, localName = "key")
+ public String key; // key item ID (optional)
+
+ @JacksonXmlProperty(isAttribute = true, localName = "trap")
+ public Integer trap; // trap difficulty (optional)
+
+ @JacksonXmlProperty(isAttribute = true, localName = "spell")
+ public String spell; // spell ID for trapped container (optional)
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "item")
+ public List contents = new ArrayList<>();
+
+ /** Item inside a container */
+ public static class ContainerItem {
+ @JacksonXmlProperty(isAttribute = true, localName = "id")
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "uid")
+ public int uid;
+ }
+ }
+
+ /** Region data for terrain generation */
+ public static class RegionData implements Serializable {
+ @JacksonXmlProperty(isAttribute = true, localName = "x")
+ public int x;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "y")
+ public int y;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "w")
+ public int w; // width
+
+ @JacksonXmlProperty(isAttribute = true, localName = "h")
+ public int h; // height
+
+ @JacksonXmlProperty(isAttribute = true, localName = "l")
+ public byte l; // layer/order
+
+ @JacksonXmlProperty(isAttribute = true, localName = "text")
+ public String text; // terrain texture ID
+
+ @JacksonXmlProperty(isAttribute = true, localName = "random")
+ public String random; // theme ID for random generation
+
+ @JacksonXmlProperty(isAttribute = true, localName = "label")
+ public String label; // optional label
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "script")
+ public List scripts = new ArrayList<>();
+
+ /** Script reference */
+ public static class ScriptReference implements Serializable {
+ @JacksonXmlProperty(isAttribute = true, localName = "id")
+ public String id;
+ }
+ }
+}
diff --git a/src/main/java/neon/maps/services/MapAtlas.java b/src/main/java/neon/maps/services/MapAtlas.java
index 13d13d4..0ff30a6 100644
--- a/src/main/java/neon/maps/services/MapAtlas.java
+++ b/src/main/java/neon/maps/services/MapAtlas.java
@@ -34,4 +34,6 @@ public interface MapAtlas {
* @return the map with the given UID
*/
Map getMap(int uid);
+
+ Map getMap(int uid, String... path);
}
diff --git a/src/main/java/neon/resources/CClient.java b/src/main/java/neon/resources/CClient.java
index 9b628d7..346856e 100644
--- a/src/main/java/neon/resources/CClient.java
+++ b/src/main/java/neon/resources/CClient.java
@@ -1,282 +1,434 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2013 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.awt.event.KeyEvent;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
-import java.util.Properties;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.input.SAXBuilder;
-
-public class CClient extends Resource {
- // keyboard settings
- public static final int NUMPAD = 0;
- public static final int AZERTY = 1;
- public static final int QWERTY = 2;
- public static final int QWERTZ = 3;
-
- public int up = KeyEvent.VK_NUMPAD8;
- public int upright = KeyEvent.VK_NUMPAD9;
- public int right = KeyEvent.VK_NUMPAD6;
- public int downright = KeyEvent.VK_NUMPAD3;
- public int down = KeyEvent.VK_NUMPAD2;
- public int downleft = KeyEvent.VK_NUMPAD1;
- public int left = KeyEvent.VK_NUMPAD4;
- public int upleft = KeyEvent.VK_NUMPAD7;
- public int wait = KeyEvent.VK_NUMPAD5;
-
- public int map = KeyEvent.VK_M;
- public int magic = KeyEvent.VK_G;
- public int shoot = KeyEvent.VK_F;
- public int look = KeyEvent.VK_L;
- public int act = KeyEvent.VK_SPACE;
- public int talk = KeyEvent.VK_T;
- public int unmount = KeyEvent.VK_U;
- public int sneak = KeyEvent.VK_V;
- public int journal = KeyEvent.VK_J;
-
- private int keys = NUMPAD;
-
- // language settings
- private Properties strings;
-
- // other settings
- private String bigCoin = "\u20AC"; // Euro symbol
- private String smallCoin = "c";
- private String title = "";
-
- public CClient(String... path) {
- super("client", path);
-
- // load file
- Document doc = new Document();
- try (FileInputStream in = new FileInputStream(path[0])) {
- doc = new SAXBuilder().build(in);
- } catch (Exception e) {
- e.printStackTrace();
- }
- Element root = doc.getRootElement();
-
- // keyboard
- setKeys(root.getChild("keys"));
-
- // language
- Properties defaults = new Properties(); // load locale.en as default
- try (FileInputStream stream = new FileInputStream("data/locale/locale.en");
- InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"))) {
- defaults.load(reader);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- String lang = root.getChild("lang").getText();
- strings = new Properties(defaults); // initialize locale with 'en' defaults
- try (FileInputStream stream = new FileInputStream("data/locale/locale." + lang);
- InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"))) {
- strings.load(reader);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void load() {}
-
- @Override
- public void unload() {}
-
- /**
- * Return the string value with the given name.
- *
- * @param name
- * @return
- */
- public String getString(String name) {
- return strings.getProperty(name);
- }
-
- public String getBig() {
- return bigCoin;
- }
-
- public void setBig(String name) {
- bigCoin = name;
- }
-
- public String getSmall() {
- return smallCoin;
- }
-
- public void setSmall(String name) {
- smallCoin = name;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public int getSettings() {
- return keys;
- }
-
- public void setKeys(Element settings) {
- if (settings != null) {
- // movement keys
- switch (settings.getText()) {
- case "azerty":
- setKeys(AZERTY);
- break;
- case "qwerty":
- setKeys(QWERTY);
- break;
- case "qwertz":
- setKeys(QWERTZ);
- break;
- }
-
- // other keys
- if (settings.getAttribute("map") != null) {
- map = getKeyCode(settings.getAttributeValue("map"));
- }
- if (settings.getAttribute("act") != null) {
- act = getKeyCode(settings.getAttributeValue("act"));
- }
- if (settings.getAttribute("magic") != null) {
- magic = getKeyCode(settings.getAttributeValue("magic"));
- }
- if (settings.getAttribute("shoot") != null) {
- shoot = getKeyCode(settings.getAttributeValue("shoot"));
- }
- if (settings.getAttribute("look") != null) {
- look = getKeyCode(settings.getAttributeValue("look"));
- }
- if (settings.getAttribute("talk") != null) {
- talk = getKeyCode(settings.getAttributeValue("talk"));
- }
- if (settings.getAttribute("unmount") != null) {
- unmount = getKeyCode(settings.getAttributeValue("unmount"));
- }
- if (settings.getAttribute("sneak") != null) {
- sneak = getKeyCode(settings.getAttributeValue("sneak"));
- }
- if (settings.getAttribute("journal") != null) {
- journal = getKeyCode(settings.getAttributeValue("journal"));
- }
- }
- }
-
- public void setKeys(int choice) {
- keys = choice;
- switch (keys) {
- case NUMPAD:
- up = KeyEvent.VK_NUMPAD8;
- upright = KeyEvent.VK_NUMPAD9;
- right = KeyEvent.VK_NUMPAD6;
- downright = KeyEvent.VK_NUMPAD3;
- down = KeyEvent.VK_NUMPAD2;
- downleft = KeyEvent.VK_NUMPAD1;
- left = KeyEvent.VK_NUMPAD4;
- upleft = KeyEvent.VK_NUMPAD7;
- wait = KeyEvent.VK_NUMPAD5;
- break;
- case AZERTY:
- up = KeyEvent.VK_Z;
- upright = KeyEvent.VK_E;
- right = KeyEvent.VK_D;
- downright = KeyEvent.VK_C;
- down = KeyEvent.VK_X;
- downleft = KeyEvent.VK_W;
- left = KeyEvent.VK_Q;
- upleft = KeyEvent.VK_A;
- wait = KeyEvent.VK_S;
- break;
- case QWERTY:
- up = KeyEvent.VK_W;
- upright = KeyEvent.VK_E;
- right = KeyEvent.VK_D;
- downright = KeyEvent.VK_C;
- down = KeyEvent.VK_X;
- downleft = KeyEvent.VK_Z;
- left = KeyEvent.VK_A;
- upleft = KeyEvent.VK_Q;
- wait = KeyEvent.VK_S;
- break;
- case QWERTZ:
- up = KeyEvent.VK_W;
- upright = KeyEvent.VK_E;
- right = KeyEvent.VK_D;
- downright = KeyEvent.VK_C;
- down = KeyEvent.VK_X;
- downleft = KeyEvent.VK_Y;
- left = KeyEvent.VK_A;
- upleft = KeyEvent.VK_Q;
- wait = KeyEvent.VK_S;
- break;
- }
- }
-
- private static int getKeyCode(String code) {
- switch (code) {
- case "VK_B":
- return KeyEvent.VK_B;
- case "VK_F":
- return KeyEvent.VK_F;
- case "VK_G":
- return KeyEvent.VK_G;
- case "VK_H":
- return KeyEvent.VK_H;
- case "VK_I":
- return KeyEvent.VK_I;
- case "VK_J":
- return KeyEvent.VK_J;
- case "VK_K":
- return KeyEvent.VK_K;
- case "VK_L":
- return KeyEvent.VK_L;
- case "VK_M":
- return KeyEvent.VK_M;
- case "VK_N":
- return KeyEvent.VK_N;
- case "VK_O":
- return KeyEvent.VK_O;
- case "VK_P":
- return KeyEvent.VK_P;
- case "VK_R":
- return KeyEvent.VK_R;
- case "VK_T":
- return KeyEvent.VK_T;
- case "VK_U":
- return KeyEvent.VK_U;
- case "VK_V":
- return KeyEvent.VK_V;
- case "VK_SPACE":
- return KeyEvent.VK_SPACE;
- default:
- return 0;
- }
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2013 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
+import java.awt.event.KeyEvent;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+import lombok.Getter;
+import lombok.Setter;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+@JacksonXmlRootElement(localName = "root")
+public class CClient extends Resource {
+ // keyboard settings
+ public static final int NUMPAD = 0;
+ public static final int AZERTY = 1;
+ public static final int QWERTY = 2;
+ public static final int QWERTZ = 3;
+
+ /** Inner class for keys configuration */
+ public static class KeysConfig {
+ @JacksonXmlProperty(isAttribute = true, localName = "map")
+ public String map;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "act")
+ public String act;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "magic")
+ public String magic;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "shoot")
+ public String shoot;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "look")
+ public String look;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "talk")
+ public String talk;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "unmount")
+ public String unmount;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "sneak")
+ public String sneak;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "journal")
+ public String journal;
+
+ @JacksonXmlText public String layout; // numpad, azerty, qwerty, qwertz
+ }
+
+ public int up = KeyEvent.VK_NUMPAD8;
+ public int upright = KeyEvent.VK_NUMPAD9;
+ public int right = KeyEvent.VK_NUMPAD6;
+ public int downright = KeyEvent.VK_NUMPAD3;
+ public int down = KeyEvent.VK_NUMPAD2;
+ public int downleft = KeyEvent.VK_NUMPAD1;
+ public int left = KeyEvent.VK_NUMPAD4;
+ public int upleft = KeyEvent.VK_NUMPAD7;
+ public int wait = KeyEvent.VK_NUMPAD5;
+
+ public int map = KeyEvent.VK_M;
+ public int magic = KeyEvent.VK_G;
+ public int shoot = KeyEvent.VK_F;
+ public int look = KeyEvent.VK_L;
+ public int act = KeyEvent.VK_SPACE;
+ public int talk = KeyEvent.VK_T;
+ public int unmount = KeyEvent.VK_U;
+ public int sneak = KeyEvent.VK_V;
+ public int journal = KeyEvent.VK_J;
+
+ @JsonIgnore private int keys = NUMPAD;
+
+ // language settings
+ @JsonIgnore private Properties strings;
+
+ @JacksonXmlProperty(localName = "lang")
+ private String lang = "en";
+
+ // other settings
+ private String bigCoin = "\u20AC"; // Euro symbol
+ private String smallCoin = "c";
+ @Setter @Getter private String title = "";
+
+ // No-arg constructor for Jackson deserialization
+ public CClient() {
+ super("client");
+ // Load default locale
+ Properties defaults = new Properties();
+ try (FileInputStream stream = new FileInputStream("data/locale/locale.en");
+ InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"))) {
+ defaults.load(reader);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ strings = defaults;
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public CClient(String... path) {
+ super("client", path);
+
+ // load file
+ Document doc = new Document();
+ try (FileInputStream in = new FileInputStream(path[0])) {
+ doc = new SAXBuilder().build(in);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ Element root = doc.getRootElement();
+
+ // keyboard
+ setKeys(root.getChild("keys"));
+
+ // language
+ Properties defaults = new Properties(); // load locale.en as default
+ try (FileInputStream stream = new FileInputStream("data/locale/locale.en");
+ InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
+ defaults.load(reader);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ String lang = root.getChild("lang").getText();
+ strings = new Properties(defaults); // initialize locale with 'en' defaults
+ try (FileInputStream stream = new FileInputStream("data/locale/locale." + lang);
+ InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"))) {
+ strings.load(reader);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void load() {}
+
+ @Override
+ public void unload() {}
+
+ /**
+ * Return the string value with the given name.
+ *
+ * @param name
+ * @return
+ */
+ public String getString(String name) {
+ return strings.getProperty(name);
+ }
+
+ public String getBig() {
+ return bigCoin;
+ }
+
+ public void setBig(String name) {
+ bigCoin = name;
+ }
+
+ public String getSmall() {
+ return smallCoin;
+ }
+
+ public void setSmall(String name) {
+ smallCoin = name;
+ }
+
+ public int getSettings() {
+ return keys;
+ }
+
+ public void setKeys(Element settings) {
+ if (settings != null) {
+ // movement keys
+ switch (settings.getText()) {
+ case "azerty":
+ setKeys(AZERTY);
+ break;
+ case "qwerty":
+ setKeys(QWERTY);
+ break;
+ case "qwertz":
+ setKeys(QWERTZ);
+ break;
+ }
+
+ // other keys
+ if (settings.getAttribute("map") != null) {
+ map = getKeyCode(settings.getAttributeValue("map"));
+ }
+ if (settings.getAttribute("act") != null) {
+ act = getKeyCode(settings.getAttributeValue("act"));
+ }
+ if (settings.getAttribute("magic") != null) {
+ magic = getKeyCode(settings.getAttributeValue("magic"));
+ }
+ if (settings.getAttribute("shoot") != null) {
+ shoot = getKeyCode(settings.getAttributeValue("shoot"));
+ }
+ if (settings.getAttribute("look") != null) {
+ look = getKeyCode(settings.getAttributeValue("look"));
+ }
+ if (settings.getAttribute("talk") != null) {
+ talk = getKeyCode(settings.getAttributeValue("talk"));
+ }
+ if (settings.getAttribute("unmount") != null) {
+ unmount = getKeyCode(settings.getAttributeValue("unmount"));
+ }
+ if (settings.getAttribute("sneak") != null) {
+ sneak = getKeyCode(settings.getAttributeValue("sneak"));
+ }
+ if (settings.getAttribute("journal") != null) {
+ journal = getKeyCode(settings.getAttributeValue("journal"));
+ }
+ }
+ }
+
+ public void setKeys(int choice) {
+ keys = choice;
+ switch (keys) {
+ case NUMPAD:
+ up = KeyEvent.VK_NUMPAD8;
+ upright = KeyEvent.VK_NUMPAD9;
+ right = KeyEvent.VK_NUMPAD6;
+ downright = KeyEvent.VK_NUMPAD3;
+ down = KeyEvent.VK_NUMPAD2;
+ downleft = KeyEvent.VK_NUMPAD1;
+ left = KeyEvent.VK_NUMPAD4;
+ upleft = KeyEvent.VK_NUMPAD7;
+ wait = KeyEvent.VK_NUMPAD5;
+ break;
+ case AZERTY:
+ up = KeyEvent.VK_Z;
+ upright = KeyEvent.VK_E;
+ right = KeyEvent.VK_D;
+ downright = KeyEvent.VK_C;
+ down = KeyEvent.VK_X;
+ downleft = KeyEvent.VK_W;
+ left = KeyEvent.VK_Q;
+ upleft = KeyEvent.VK_A;
+ wait = KeyEvent.VK_S;
+ break;
+ case QWERTY:
+ up = KeyEvent.VK_W;
+ upright = KeyEvent.VK_E;
+ right = KeyEvent.VK_D;
+ downright = KeyEvent.VK_C;
+ down = KeyEvent.VK_X;
+ downleft = KeyEvent.VK_Z;
+ left = KeyEvent.VK_A;
+ upleft = KeyEvent.VK_Q;
+ wait = KeyEvent.VK_S;
+ break;
+ case QWERTZ:
+ up = KeyEvent.VK_W;
+ upright = KeyEvent.VK_E;
+ right = KeyEvent.VK_D;
+ downright = KeyEvent.VK_C;
+ down = KeyEvent.VK_X;
+ downleft = KeyEvent.VK_Y;
+ left = KeyEvent.VK_A;
+ upleft = KeyEvent.VK_Q;
+ wait = KeyEvent.VK_S;
+ break;
+ }
+ }
+
+ /** Jackson setter for keys configuration */
+ @JacksonXmlProperty(localName = "keys")
+ public void setKeysConfig(KeysConfig config) {
+ if (config != null) {
+ // Set layout based on text content
+ if (config.layout != null) {
+ switch (config.layout) {
+ case "azerty":
+ setKeys(AZERTY);
+ break;
+ case "qwerty":
+ setKeys(QWERTY);
+ break;
+ case "qwertz":
+ setKeys(QWERTZ);
+ break;
+ default:
+ setKeys(NUMPAD);
+ }
+ }
+
+ // Set custom keybindings from attributes
+ if (config.map != null) {
+ map = getKeyCode(config.map);
+ }
+ if (config.act != null) {
+ act = getKeyCode(config.act);
+ }
+ if (config.magic != null) {
+ magic = getKeyCode(config.magic);
+ }
+ if (config.shoot != null) {
+ shoot = getKeyCode(config.shoot);
+ }
+ if (config.look != null) {
+ look = getKeyCode(config.look);
+ }
+ if (config.talk != null) {
+ talk = getKeyCode(config.talk);
+ }
+ if (config.unmount != null) {
+ unmount = getKeyCode(config.unmount);
+ }
+ if (config.sneak != null) {
+ sneak = getKeyCode(config.sneak);
+ }
+ if (config.journal != null) {
+ journal = getKeyCode(config.journal);
+ }
+ }
+ }
+
+ /** Jackson getter for keys configuration */
+ @JacksonXmlProperty(localName = "keys")
+ public KeysConfig getKeysConfig() {
+ KeysConfig config = new KeysConfig();
+ // Set layout based on keys field
+ switch (keys) {
+ case AZERTY:
+ config.layout = "azerty";
+ break;
+ case QWERTY:
+ config.layout = "qwerty";
+ break;
+ case QWERTZ:
+ config.layout = "qwertz";
+ break;
+ default:
+ config.layout = "numpad";
+ }
+ // Note: We don't serialize the individual key bindings as attributes
+ // in this getter - they would need to be converted back to VK_ strings
+ return config;
+ }
+
+ /** Jackson setter for language - loads locale file */
+ @JacksonXmlProperty(localName = "lang")
+ public void setLang(String language) {
+ this.lang = language;
+ // Load locale file
+ Properties defaults = new Properties();
+ try (FileInputStream stream = new FileInputStream("data/locale/locale.en");
+ InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"))) {
+ defaults.load(reader);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ strings = new Properties(defaults);
+ try (FileInputStream stream = new FileInputStream("data/locale/locale." + language);
+ InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"))) {
+ strings.load(reader);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /** Jackson getter for language */
+ @JacksonXmlProperty(localName = "lang")
+ public String getLang() {
+ return lang;
+ }
+
+ private static int getKeyCode(String code) {
+ return switch (code) {
+ case "VK_B" -> KeyEvent.VK_B;
+ case "VK_F" -> KeyEvent.VK_F;
+ case "VK_G" -> KeyEvent.VK_G;
+ case "VK_H" -> KeyEvent.VK_H;
+ case "VK_I" -> KeyEvent.VK_I;
+ case "VK_J" -> KeyEvent.VK_J;
+ case "VK_K" -> KeyEvent.VK_K;
+ case "VK_L" -> KeyEvent.VK_L;
+ case "VK_M" -> KeyEvent.VK_M;
+ case "VK_N" -> KeyEvent.VK_N;
+ case "VK_O" -> KeyEvent.VK_O;
+ case "VK_P" -> KeyEvent.VK_P;
+ case "VK_R" -> KeyEvent.VK_R;
+ case "VK_T" -> KeyEvent.VK_T;
+ case "VK_U" -> KeyEvent.VK_U;
+ case "VK_V" -> KeyEvent.VK_V;
+ case "VK_SPACE" -> KeyEvent.VK_SPACE;
+ default -> 0;
+ };
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ public Element toElement() {
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ return new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize CClient to Element", e);
+ }
+ }
+}
diff --git a/src/main/java/neon/resources/CGame.java b/src/main/java/neon/resources/CGame.java
index 264ab43..f289fe8 100644
--- a/src/main/java/neon/resources/CGame.java
+++ b/src/main/java/neon/resources/CGame.java
@@ -21,14 +21,16 @@
import java.awt.Point;
import java.util.ArrayList;
import java.util.Collection;
+import lombok.Getter;
+import lombok.Setter;
public class CGame extends Resource {
private ArrayList playableRaces = new ArrayList<>();
private ArrayList startingItems = new ArrayList<>();
private ArrayList startingSpells = new ArrayList<>();
- private Point startPosition = new Point(0, 0);
- private String[] startMap;
- private int startZone = 0; // default
+ @Getter private Point startPosition = new Point(0, 0);
+ @Setter @Getter private String[] startMap;
+ @Setter @Getter private int startZone = 0; // default
public CGame(String id, String... path) {
super(id, path);
@@ -48,26 +50,6 @@ public Collection getStartingSpells() {
return startingSpells;
}
- public Point getStartPosition() {
- return startPosition;
- }
-
- public String[] getStartMap() {
- return startMap;
- }
-
- public void setStartMap(String[] map) {
- startMap = map;
- }
-
- public int getStartZone() {
- return startZone;
- }
-
- public void setStartZone(int zone) {
- startZone = zone;
- }
-
public Collection getPlayableRaces() {
return playableRaces;
}
diff --git a/src/main/java/neon/resources/CServer.java b/src/main/java/neon/resources/CServer.java
index 83420a3..7cf5ed6 100644
--- a/src/main/java/neon/resources/CServer.java
+++ b/src/main/java/neon/resources/CServer.java
@@ -1,88 +1,175 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2013 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.input.SAXBuilder;
-
-/**
- * A resource that keeps track of all configuration settings in neon.ini.xml.
- *
- * @author mdriesen
- */
-public class CServer extends Resource {
- private ArrayList mods = new ArrayList();
- private String log = "FINEST";
- private boolean gThread = true;
- // private boolean audio = false;
- private int ai = 20;
-
- public CServer(String... path) {
- super("ini", path);
-
- // load file
- Document doc = new Document();
- try (FileInputStream in = new FileInputStream(path[0])) {
- doc = new SAXBuilder().build(in);
- } catch (Exception e) {
- e.printStackTrace();
- }
- Element root = doc.getRootElement();
-
- // mods
- Element files = root.getChild("files");
- for (Element file : files.getChildren("file")) {
- mods.add(file.getText());
- }
-
- // logging
- log = root.getChildText("log").toUpperCase();
-
- // map generation thread
- gThread = root.getChild("threads").getAttributeValue("generate").equals("on");
-
- // ai range
- ai = Integer.parseInt(root.getChildText("ai"));
- }
-
- @Override
- public void load() {} // loading not possible
-
- @Override
- public void unload() {} // unloading not possible
-
- public String getLogLevel() {
- return log;
- }
-
- public ArrayList getMods() {
- return mods;
- }
-
- public boolean isMapThreaded() {
- return gThread;
- }
-
- public int getAIRange() {
- return ai;
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2013 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.List;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+/**
+ * A resource that keeps track of all configuration settings in neon.ini.xml.
+ *
+ * @author mdriesen
+ */
+@JacksonXmlRootElement(localName = "root")
+public class CServer extends Resource {
+ @JsonIgnore private ArrayList mods = new ArrayList();
+
+ @JacksonXmlProperty(localName = "log")
+ private String log = "FINEST";
+
+ @JsonIgnore private boolean gThread = true;
+
+ // private boolean audio = false;
+
+ @JacksonXmlProperty(localName = "ai")
+ private int ai = 20;
+
+ /** Inner class for file entries */
+ public static class FileEntry {
+ @JacksonXmlText public String value;
+ }
+
+ /** Inner class for threads configuration */
+ public static class Threads {
+ @JacksonXmlProperty(isAttribute = true, localName = "generate")
+ public String generate;
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public CServer() {
+ super("ini");
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public CServer(String... path) {
+ super("ini", path);
+
+ // load file
+ Document doc = new Document();
+ try (FileInputStream in = new FileInputStream(path[0])) {
+ doc = new SAXBuilder().build(in);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ Element root = doc.getRootElement();
+
+ // mods
+ Element files = root.getChild("files");
+ for (Element file : files.getChildren("file")) {
+ mods.add(file.getText());
+ }
+
+ // logging
+ log = root.getChildText("log").toUpperCase();
+
+ // map generation thread
+ gThread = root.getChild("threads").getAttributeValue("generate").equals("on");
+
+ // ai range
+ ai = Integer.parseInt(root.getChildText("ai"));
+ }
+
+ @Override
+ public void load() {} // loading not possible
+
+ @Override
+ public void unload() {} // unloading not possible
+
+ public String getLogLevel() {
+ return log;
+ }
+
+ public ArrayList getMods() {
+ return mods;
+ }
+
+ public boolean isMapThreaded() {
+ return gThread;
+ }
+
+ public int getAIRange() {
+ return ai;
+ }
+
+ /** Jackson setter for mods - converts list to ArrayList */
+ @JacksonXmlElementWrapper(localName = "files")
+ @JacksonXmlProperty(localName = "file")
+ public void setFileList(List fileList) {
+ if (fileList != null) {
+ for (FileEntry entry : fileList) {
+ mods.add(entry.value);
+ }
+ }
+ }
+
+ /** Jackson getter for mods - converts ArrayList to list */
+ @JacksonXmlElementWrapper(localName = "files")
+ @JacksonXmlProperty(localName = "file")
+ public List getFileList() {
+ List list = new ArrayList<>();
+ for (String mod : mods) {
+ FileEntry fe = new FileEntry();
+ fe.value = mod;
+ list.add(fe);
+ }
+ return list;
+ }
+
+ /** Jackson setter for threads configuration */
+ @JacksonXmlProperty(localName = "threads")
+ public void setThreads(Threads threads) {
+ if (threads != null) {
+ gThread = threads.generate.equals("on");
+ }
+ }
+
+ /** Jackson getter for threads configuration */
+ @JacksonXmlProperty(localName = "threads")
+ public Threads getThreads() {
+ Threads t = new Threads();
+ t.generate = gThread ? "on" : "off";
+ return t;
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ public Element toElement() {
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ return new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize CServer to Element", e);
+ }
+ }
+}
diff --git a/src/main/java/neon/resources/LCreature.java b/src/main/java/neon/resources/LCreature.java
index d65da65..68b0300 100644
--- a/src/main/java/neon/resources/LCreature.java
+++ b/src/main/java/neon/resources/LCreature.java
@@ -1,51 +1,99 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2012 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.util.HashMap;
-import org.jdom2.Element;
-
-public class LCreature extends RCreature {
- public HashMap creatures = new HashMap();
-
- public LCreature(Element e, String... path) {
- super(e.getAttributeValue("id"), path);
- for (Element c : e.getChildren()) {
- creatures.put(c.getAttributeValue("id"), Integer.parseInt(c.getAttributeValue("l")));
- }
- }
-
- public LCreature(String id, String... path) {
- super(id, path);
- }
-
- public Element toElement() {
- Element list = new Element("list");
- list.setAttribute("id", id);
-
- for (String s : creatures.keySet()) {
- Element creature = new Element("creature");
- creature.setAttribute("id", s);
- creature.setAttribute("l", creatures.get(s).toString());
- list.addContent(creature);
- }
-
- return list;
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.ByteArrayInputStream;
+import java.util.HashMap;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+@JacksonXmlRootElement(localName = "list")
+public class LCreature extends RCreature {
+ public HashMap creatures = new HashMap();
+
+ /** Inner class for Jackson XML parsing */
+ public static class CreatureEntry {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "l")
+ public int level;
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public LCreature() {
+ super();
+ }
+
+ public LCreature(String id, String... path) {
+ super(id, path);
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public LCreature(Element e, String... path) {
+ super(e.getAttributeValue("id"), path);
+ for (Element c : e.getChildren()) {
+ creatures.put(c.getAttributeValue("id"), Integer.parseInt(c.getAttributeValue("l")));
+ }
+ }
+
+ /** Jackson setter for creature entries - converts list to HashMap */
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "creature")
+ public void setCreatureList(java.util.List creatureList) {
+ if (creatureList != null) {
+ for (CreatureEntry entry : creatureList) {
+ creatures.put(entry.id, entry.level);
+ }
+ }
+ }
+
+ /** Jackson getter for creature entries - converts HashMap to list */
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "creature")
+ public java.util.List getCreatureList() {
+ java.util.List list = new java.util.ArrayList<>();
+ for (java.util.Map.Entry entry : creatures.entrySet()) {
+ CreatureEntry ce = new CreatureEntry();
+ ce.id = entry.getKey();
+ ce.level = entry.getValue();
+ list.add(ce);
+ }
+ return list;
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ public Element toElement() {
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ return new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize LCreature to Element", e);
+ }
+ }
+}
diff --git a/src/main/java/neon/resources/LItem.java b/src/main/java/neon/resources/LItem.java
index 34b3f20..0582ce3 100644
--- a/src/main/java/neon/resources/LItem.java
+++ b/src/main/java/neon/resources/LItem.java
@@ -1,51 +1,99 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2012 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.util.HashMap;
-import org.jdom2.Element;
-
-public class LItem extends RItem {
- public HashMap items = new HashMap();
-
- public LItem(Element e, String... path) {
- super(e.getAttributeValue("id"), Type.item, path);
- for (Element c : e.getChildren()) {
- items.put(c.getAttributeValue("id"), Integer.parseInt(c.getAttributeValue("l")));
- }
- }
-
- public LItem(String id, String... path) {
- super(id, Type.item, path);
- }
-
- public Element toElement() {
- Element list = new Element("list");
- list.setAttribute("id", id);
-
- for (String s : items.keySet()) {
- Element item = new Element("item");
- item.setAttribute("id", s);
- item.setAttribute("l", items.get(s).toString());
- list.addContent(item);
- }
-
- return list;
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.ByteArrayInputStream;
+import java.util.HashMap;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+@JacksonXmlRootElement(localName = "list")
+public class LItem extends RItem {
+ public HashMap items = new HashMap();
+
+ /** Inner class for Jackson XML parsing */
+ public static class ItemEntry {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "l")
+ public int level;
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public LItem() {
+ super();
+ }
+
+ public LItem(String id, String... path) {
+ super(id, Type.item, path);
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public LItem(Element e, String... path) {
+ super(e.getAttributeValue("id"), Type.item, path);
+ for (Element c : e.getChildren()) {
+ items.put(c.getAttributeValue("id"), Integer.parseInt(c.getAttributeValue("l")));
+ }
+ }
+
+ /** Jackson setter for item entries - converts list to HashMap */
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "item")
+ public void setItemList(java.util.List itemList) {
+ if (itemList != null) {
+ for (ItemEntry entry : itemList) {
+ items.put(entry.id, entry.level);
+ }
+ }
+ }
+
+ /** Jackson getter for item entries - converts HashMap to list */
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "item")
+ public java.util.List getItemList() {
+ java.util.List list = new java.util.ArrayList<>();
+ for (java.util.Map.Entry entry : items.entrySet()) {
+ ItemEntry ie = new ItemEntry();
+ ie.id = entry.getKey();
+ ie.level = entry.getValue();
+ list.add(ie);
+ }
+ return list;
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ public Element toElement() {
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ return new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize LItem to Element", e);
+ }
+ }
+}
diff --git a/src/main/java/neon/resources/LSpell.java b/src/main/java/neon/resources/LSpell.java
index ccb753b..a5ba1d1 100644
--- a/src/main/java/neon/resources/LSpell.java
+++ b/src/main/java/neon/resources/LSpell.java
@@ -1,51 +1,99 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2012 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.util.HashMap;
-import org.jdom2.Element;
-
-public class LSpell extends RSpell {
- public HashMap spells = new HashMap();
-
- public LSpell(Element e, String... path) {
- super(e.getAttributeValue("id"), SpellType.SPELL, path);
- for (Element s : e.getChildren()) {
- spells.put(s.getAttributeValue("id"), Integer.parseInt(s.getAttributeValue("l")));
- }
- }
-
- public LSpell(String id, String path) {
- super(id, SpellType.SPELL, path);
- }
-
- public Element toElement() {
- Element list = new Element("list");
- list.setAttribute("id", id);
-
- for (String s : spells.keySet()) {
- Element spell = new Element("spell");
- spell.setAttribute("id", s);
- spell.setAttribute("l", spells.get(s).toString());
- list.addContent(spell);
- }
-
- return list;
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.ByteArrayInputStream;
+import java.util.HashMap;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+@JacksonXmlRootElement(localName = "list")
+public class LSpell extends RSpell {
+ public HashMap spells = new HashMap();
+
+ /** Inner class for Jackson XML parsing */
+ public static class SpellEntry {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "l")
+ public int level;
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public LSpell() {
+ super();
+ }
+
+ public LSpell(String id, String... path) {
+ super(id, SpellType.SPELL, path);
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public LSpell(Element e, String... path) {
+ super(e.getAttributeValue("id"), SpellType.SPELL, path);
+ for (Element s : e.getChildren()) {
+ spells.put(s.getAttributeValue("id"), Integer.parseInt(s.getAttributeValue("l")));
+ }
+ }
+
+ /** Jackson setter for spell entries - converts list to HashMap */
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "spell")
+ public void setSpellList(java.util.List spellList) {
+ if (spellList != null) {
+ for (SpellEntry entry : spellList) {
+ spells.put(entry.id, entry.level);
+ }
+ }
+ }
+
+ /** Jackson getter for spell entries - converts HashMap to list */
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "spell")
+ public java.util.List getSpellList() {
+ java.util.List list = new java.util.ArrayList<>();
+ for (java.util.Map.Entry entry : spells.entrySet()) {
+ SpellEntry se = new SpellEntry();
+ se.id = entry.getKey();
+ se.level = entry.getValue();
+ list.add(se);
+ }
+ return list;
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ public Element toElement() {
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ return new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize LSpell to Element", e);
+ }
+ }
+}
diff --git a/src/main/java/neon/resources/RClothing.java b/src/main/java/neon/resources/RClothing.java
index dc501db..c5fe779 100644
--- a/src/main/java/neon/resources/RClothing.java
+++ b/src/main/java/neon/resources/RClothing.java
@@ -1,84 +1,205 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2012 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.io.Serializable;
-import neon.entities.property.Slot;
-import neon.magic.Effect;
-import org.jdom2.Element;
-
-public class RClothing extends RItem implements Serializable {
- public enum ArmorType {
- LIGHT,
- MEDIUM,
- HEAVY,
- NONE;
- }
-
- // general properties
- public ArmorType kind;
- public int rating;
- public Slot slot;
-
- // enchantment
- public int magnitude;
- public int mana;
- public Effect effect;
-
- public RClothing(Element cloth, String... path) {
- super(cloth, path);
- Element stats = cloth.getChild("stats");
- slot = Slot.valueOf(stats.getAttributeValue("slot").toUpperCase());
-
- if (cloth.getName().equals("armor")) {
- rating = Integer.parseInt(stats.getAttributeValue("ar"));
- kind = ArmorType.valueOf(stats.getAttributeValue("class").toUpperCase());
- } else {
- rating = 0;
- kind = ArmorType.NONE;
- }
-
- if (cloth.getChild("enchant") != null) {
- Element enchantment = cloth.getChild("enchant");
- magnitude = Integer.parseInt(enchantment.getAttributeValue("mag"));
- mana = Integer.parseInt(enchantment.getAttributeValue("mana"));
- effect = Effect.valueOf(enchantment.getAttributeValue("effect").toUpperCase());
- } else {
- magnitude = 0;
- mana = 0;
- effect = null;
- }
- }
-
- public RClothing(String id, Type type, String... path) {
- super(id, type, path);
- }
-
- public Element toElement() {
- Element clothing = super.toElement();
- Element stats = new Element("stats");
- stats.setAttribute("slot", slot.toString());
- if (type == Type.armor) {
- stats.setAttribute("class", kind.toString());
- stats.setAttribute("ar", Integer.toString(rating));
- }
- clothing.addContent(stats);
- return clothing;
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import java.io.Serializable;
+import neon.entities.property.Slot;
+import neon.magic.Effect;
+import org.jdom2.Element;
+
+public class RClothing extends RItem implements Serializable {
+ public enum ArmorType {
+ LIGHT,
+ MEDIUM,
+ HEAVY,
+ NONE;
+ }
+
+ // Nested elements (deserialized via setters to sync with public fields)
+ @com.fasterxml.jackson.annotation.JsonIgnore private StatsElement statsElement;
+
+ @com.fasterxml.jackson.annotation.JsonIgnore private EnchantElement enchantElement;
+
+ // Public fields for game code compatibility - marked JsonIgnore as they're serialized via nested
+ // elements
+ @com.fasterxml.jackson.annotation.JsonIgnore public ArmorType kind;
+
+ @com.fasterxml.jackson.annotation.JsonIgnore public int rating;
+
+ @com.fasterxml.jackson.annotation.JsonIgnore public Slot slot;
+
+ // enchantment - marked JsonIgnore as they're serialized via nested element
+ @com.fasterxml.jackson.annotation.JsonIgnore public int magnitude;
+
+ @com.fasterxml.jackson.annotation.JsonIgnore public int mana;
+
+ @com.fasterxml.jackson.annotation.JsonIgnore public Effect effect;
+
+ /** Inner class for stats XML element */
+ public static class StatsElement implements Serializable {
+ @JacksonXmlProperty(isAttribute = true)
+ public Slot slot;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "ar")
+ @JsonProperty(required = false)
+ public Integer rating;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "class")
+ @JsonProperty(required = false)
+ public ArmorType armorClass;
+
+ public StatsElement() {}
+ }
+
+ /** Inner class for enchant XML element */
+ public static class EnchantElement implements Serializable {
+ @JacksonXmlProperty(isAttribute = true, localName = "mag")
+ public int magnitude;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public int mana;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public Effect effect;
+
+ public EnchantElement() {}
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public RClothing() {
+ super();
+ this.type = Type.clothing; // Default type (can also be armor)
+ }
+
+ public RClothing(String id, Type type, String... path) {
+ super(id, type, path);
+ }
+
+ /**
+ * Sync stats element to public fields (called by Jackson after deserialization).
+ *
+ * @param stats the deserialized stats element
+ */
+ @JacksonXmlProperty(localName = "stats")
+ public void setStats(StatsElement stats) {
+ this.statsElement = stats;
+ this.slot = stats.slot;
+ if (stats.rating != null) {
+ this.rating = stats.rating;
+ this.kind = stats.armorClass;
+ } else {
+ this.rating = 0;
+ this.kind = ArmorType.NONE;
+ }
+ }
+
+ /**
+ * Get stats element for serialization.
+ *
+ * @return stats element
+ */
+ @com.fasterxml.jackson.annotation.JsonGetter("stats")
+ public StatsElement getStats() {
+ StatsElement stats = new StatsElement();
+ stats.slot = slot;
+ if (type == Type.armor) {
+ stats.armorClass = kind;
+ stats.rating = rating;
+ }
+ return stats;
+ }
+
+ /**
+ * Sync enchant element to public fields (called by Jackson after deserialization).
+ *
+ * @param enchant the deserialized enchant element
+ */
+ @JacksonXmlProperty(localName = "enchant")
+ @JsonProperty(required = false)
+ public void setEnchant(EnchantElement enchant) {
+ this.enchantElement = enchant;
+ if (enchant != null) {
+ this.magnitude = enchant.magnitude;
+ this.mana = enchant.mana;
+ this.effect = enchant.effect;
+ } else {
+ this.magnitude = 0;
+ this.mana = 0;
+ this.effect = null;
+ }
+ }
+
+ /**
+ * Get enchant element for serialization.
+ *
+ * @return enchant element or null
+ */
+ @com.fasterxml.jackson.annotation.JsonGetter("enchant")
+ public EnchantElement getEnchant() {
+ if (magnitude > 0 || mana > 0 || effect != null) {
+ EnchantElement enchant = new EnchantElement();
+ enchant.magnitude = magnitude;
+ enchant.mana = mana;
+ enchant.effect = effect;
+ return enchant;
+ }
+ return null;
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public RClothing(Element cloth, String... path) {
+ super(cloth, path);
+ Element stats = cloth.getChild("stats");
+ slot = Slot.valueOf(stats.getAttributeValue("slot").toUpperCase());
+
+ if (cloth.getName().equals("armor")) {
+ rating = Integer.parseInt(stats.getAttributeValue("ar"));
+ kind = ArmorType.valueOf(stats.getAttributeValue("class").toUpperCase());
+ } else {
+ rating = 0;
+ kind = ArmorType.NONE;
+ }
+
+ if (cloth.getChild("enchant") != null) {
+ Element enchantment = cloth.getChild("enchant");
+ magnitude = Integer.parseInt(enchantment.getAttributeValue("mag"));
+ mana = Integer.parseInt(enchantment.getAttributeValue("mana"));
+ effect = Effect.valueOf(enchantment.getAttributeValue("effect").toUpperCase());
+ } else {
+ magnitude = 0;
+ mana = 0;
+ effect = null;
+ }
+ }
+
+ @Override
+ public Element toElement() {
+ Element clothing = super.toElement();
+ Element stats = new Element("stats");
+ stats.setAttribute("slot", slot.toString());
+ if (type == Type.armor) {
+ stats.setAttribute("class", kind.toString());
+ stats.setAttribute("ar", Integer.toString(rating));
+ }
+ clothing.addContent(stats);
+ return clothing;
+ }
+}
diff --git a/src/main/java/neon/resources/RCraft.java b/src/main/java/neon/resources/RCraft.java
index 27ba642..f938d15 100644
--- a/src/main/java/neon/resources/RCraft.java
+++ b/src/main/java/neon/resources/RCraft.java
@@ -18,18 +18,51 @@
package neon.resources;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.ByteArrayInputStream;
+import neon.systems.files.JacksonMapper;
import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+@JacksonXmlRootElement(localName = "craft")
public class RCraft extends RData {
+ @JacksonXmlProperty(isAttribute = true)
public String raw;
- public int amount, cost;
- public RCraft(Element properties, String... path) {
- super(properties.getAttributeValue("id"), path);
- name = properties.getAttributeValue("result");
- raw = properties.getAttributeValue("raw");
- amount = Integer.parseInt(properties.getAttributeValue("amount"));
- cost = Integer.parseInt(properties.getAttributeValue("cost"));
+ @JacksonXmlProperty(isAttribute = true)
+ public int amount;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public int cost;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "result")
+ @JsonProperty(required = false)
+ private String resultName; // Maps to 'name' field in parent
+
+ // No-arg constructor for Jackson deserialization
+ public RCraft() {
+ super("unknown");
+ }
+
+ /**
+ * Sync result name to parent name field (called by Jackson after deserialization).
+ *
+ * @param resultName the result name
+ */
+ public void setResult(String resultName) {
+ this.resultName = resultName;
+ this.name = resultName;
+ }
+
+ /**
+ * Get result name for serialization.
+ *
+ * @return result name
+ */
+ public String getResult() {
+ return name;
}
public RCraft(String id, RItem item, String... path) {
@@ -50,13 +83,28 @@ public RCraft(RCraft procedure) {
cost = procedure.cost;
}
+ // Keep JDOM constructor for backward compatibility during migration
+ public RCraft(Element properties, String... path) {
+ super(properties.getAttributeValue("id"), path);
+ name = properties.getAttributeValue("result");
+ raw = properties.getAttributeValue("raw");
+ amount = Integer.parseInt(properties.getAttributeValue("amount"));
+ cost = Integer.parseInt(properties.getAttributeValue("cost"));
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ @Override
public Element toElement() {
- Element procedure = new Element("craft");
- procedure.setAttribute("id", id);
- procedure.setAttribute("result", name);
- procedure.setAttribute("raw", raw);
- procedure.setAttribute("amount", Integer.toString(amount));
- procedure.setAttribute("cost", Integer.toString(cost));
- return procedure;
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ return new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize RCraft to Element", e);
+ }
}
}
diff --git a/src/main/java/neon/resources/RCreature.java b/src/main/java/neon/resources/RCreature.java
index 9a6b59d..fe29072 100644
--- a/src/main/java/neon/resources/RCreature.java
+++ b/src/main/java/neon/resources/RCreature.java
@@ -1,198 +1,426 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2012 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.util.ArrayList;
-import java.util.EnumMap;
-import neon.entities.property.Habitat;
-import neon.entities.property.Skill;
-import neon.entities.property.Subtype;
-import org.jdom2.Element;
-
-public class RCreature extends RData {
- public enum Size {
- tiny,
- small,
- medium,
- large,
- huge;
- }
-
- public enum Type {
- animal,
- construct,
- daemon,
- dragon,
- goblin,
- humanoid,
- monster,
- player;
- }
-
- public enum AIType {
- wander,
- guard,
- schedule;
- }
-
- public final EnumMap skills;
- public final ArrayList subtypes;
- public String hit, av;
- public int speed, mana, dv;
- public float str, dex, con, iq, wis, cha;
- public AIType aiType = AIType.guard; // default
- public int aiRange = 10, aiConf = 0, aiAggr = 0;
- public Size size = Size.medium; // default
- public Type type = Type.animal; // default
- public Habitat habitat = Habitat.LAND; // default
-
- public RCreature(String id, String... path) {
- super(id, path);
- subtypes = new ArrayList();
- skills = new EnumMap(Skill.class);
- hit = "1d1";
- av = "1d1";
- }
-
- public RCreature(Element properties, String... path) {
- super(properties, path);
- subtypes = new ArrayList();
- skills = initSkills(properties.getChild("skills"));
-
- color = properties.getAttributeValue("color");
- hit = properties.getAttributeValue("hit");
- av = properties.getChild("av").getText();
- text = properties.getAttributeValue("char");
-
- size = Size.valueOf(properties.getAttributeValue("size"));
- type = Type.valueOf(properties.getName());
-
- str = Integer.parseInt(properties.getChild("stats").getAttributeValue("str"));
- con = Integer.parseInt(properties.getChild("stats").getAttributeValue("con"));
- dex = Integer.parseInt(properties.getChild("stats").getAttributeValue("dex"));
- iq = Integer.parseInt(properties.getChild("stats").getAttributeValue("int"));
- wis = Integer.parseInt(properties.getChild("stats").getAttributeValue("wis"));
- cha = Integer.parseInt(properties.getChild("stats").getAttributeValue("cha"));
-
- speed = Integer.parseInt(properties.getAttributeValue("speed"));
- if (properties.getAttributeValue("mana") != null) { // not always present
- mana = Integer.parseInt(properties.getAttributeValue("mana"));
- }
- if (properties.getChild("dv") != null) { // not always present
- dv = Integer.parseInt(properties.getChild("dv").getText());
- }
-
- if (properties.getAttribute("habitat") != null) {
- habitat = Habitat.valueOf(properties.getAttributeValue("habitat").toUpperCase());
- }
-
- Element brain = properties.getChild("ai");
- if (brain != null) {
- if (!brain.getText().isEmpty()) {
- aiType = AIType.valueOf(brain.getText());
- }
- if (brain.getAttributeValue("r") != null) {
- aiRange = Integer.parseInt(brain.getAttributeValue("r"));
- }
- if (brain.getAttributeValue("a") != null) {
- aiAggr = Integer.parseInt(brain.getAttributeValue("a"));
- }
- if (brain.getAttributeValue("c") != null) {
- aiConf = Integer.parseInt(brain.getAttributeValue("c"));
- }
- }
- }
-
- public String getName() {
- return name != null ? name : id;
- }
-
- private static EnumMap initSkills(Element skills) {
- EnumMap list = new EnumMap(Skill.class);
- for (Skill skill : Skill.values()) {
- if (skills != null && skills.getAttribute(skill.toString().toLowerCase()) != null) {
- list.put(skill, Float.parseFloat(skills.getAttributeValue(skill.toString().toLowerCase())));
- } else {
- list.put(skill, 0f);
- }
- }
- return list;
- }
-
- @Override
- public Element toElement() {
- Element creature = new Element(type.toString());
-
- creature.setAttribute("id", id);
- creature.setAttribute("size", size.toString());
- creature.setAttribute("char", text);
- creature.setAttribute("color", color);
- creature.setAttribute("hit", hit);
- creature.setAttribute("speed", Integer.toString(speed));
-
- if (mana > 0) {
- creature.setAttribute("mana", Integer.toString(mana));
- }
- if (name != null && !name.isEmpty()) {
- creature.setAttribute("name", name);
- }
- if (habitat != Habitat.LAND) {
- creature.setAttribute("habitat", habitat.name());
- }
-
- Element stats = new Element("stats");
- stats.setAttribute("str", Integer.toString((int) str));
- stats.setAttribute("con", Integer.toString((int) con));
- stats.setAttribute("dex", Integer.toString((int) dex));
- stats.setAttribute("int", Integer.toString((int) iq));
- stats.setAttribute("wis", Integer.toString((int) wis));
- stats.setAttribute("cha", Integer.toString((int) cha));
- creature.addContent(stats);
-
- if (av != null && !av.isEmpty()) {
- Element avElement = new Element("av");
- avElement.setText(av);
- creature.addContent(avElement);
- }
- if (dv > 0) {
- Element dvElement = new Element("dv");
- dvElement.setText(Integer.toString(dv));
- creature.addContent(dvElement);
- }
-
- if (aiAggr > 0 || aiConf > 0 || aiRange > 0 || aiType != null) {
- Element ai = new Element("ai");
- if (aiType != null) {
- ai.setText(aiType.toString());
- }
- if (aiAggr > 0) {
- ai.setAttribute("a", Integer.toString(aiAggr));
- }
- if (aiConf > 0) {
- ai.setAttribute("c", Integer.toString(aiConf));
- }
- if (aiRange > 0) {
- ai.setAttribute("r", Integer.toString(aiRange));
- }
- creature.addContent(ai);
- }
-
- return creature;
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
+import java.io.ByteArrayInputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import neon.entities.property.Habitat;
+import neon.entities.property.Skill;
+import neon.entities.property.Subtype;
+import neon.resources.jackson.SkillMapDeserializer;
+import neon.resources.jackson.SkillMapSerializer;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+@JacksonXmlRootElement // No localName - accepts any element name (humanoid, animal, etc.)
+public class RCreature extends RData {
+ public enum Size {
+ tiny,
+ small,
+ medium,
+ large,
+ huge;
+ }
+
+ public enum Type {
+ animal,
+ construct,
+ daemon,
+ dragon,
+ goblin,
+ humanoid,
+ monster,
+ player;
+ }
+
+ public enum AIType {
+ wander,
+ guard,
+ schedule;
+ }
+
+ // Jackson annotations for fields (id, text, color, name inherited from parent)
+ @JacksonXmlProperty(isAttribute = true)
+ public String hit;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public int speed;
+
+ @JacksonXmlProperty(isAttribute = true)
+ @JsonProperty(required = false)
+ public int mana;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public Size size = Size.medium;
+
+ @JacksonXmlProperty(isAttribute = true)
+ @JsonProperty(required = false)
+ public Habitat habitat = Habitat.LAND;
+
+ // Nested elements (deserialized via setters to sync with public fields)
+ private Stats statsObj;
+ private AIConfig aiObj;
+ private AVElement avElement;
+ private DVElement dvElement;
+
+ // Public fields for game code compatibility
+ public String av;
+ public int dv;
+
+ @JsonSerialize(using = SkillMapSerializer.class)
+ public final EnumMap skills;
+
+ // Public fields for game code compatibility
+ public float str, dex, con, iq, wis, cha;
+ public AIType aiType = AIType.guard;
+ public int aiRange = 10, aiConf = 0, aiAggr = 0;
+ public final ArrayList subtypes;
+ public Type type = Type.animal; // Set externally based on element name
+
+ /** Inner class for stats XML element */
+ public static class Stats implements Serializable {
+ @JacksonXmlProperty(isAttribute = true)
+ public float str;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public float con;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public float dex;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "int")
+ public float iq; // "int" is reserved keyword
+
+ @JacksonXmlProperty(isAttribute = true)
+ public float wis;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public float cha;
+
+ public Stats() {}
+ }
+
+ /** Inner class for AI configuration */
+ public static class AIConfig implements Serializable {
+ @JacksonXmlText public AIType aiType = AIType.guard;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "r")
+ @JsonProperty(required = false)
+ public int aiRange = 10;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "a")
+ @JsonProperty(required = false)
+ public int aiAggr = 0;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "c")
+ @JsonProperty(required = false)
+ public int aiConf = 0;
+
+ public AIConfig() {}
+ }
+
+ /** Inner class for AV (armor value) XML element */
+ public static class AVElement implements Serializable {
+ @JacksonXmlText public String value;
+
+ public AVElement() {}
+ }
+
+ /** Inner class for DV (defense value) XML element */
+ public static class DVElement implements Serializable {
+ @JacksonXmlText public Integer value;
+
+ public DVElement() {}
+ }
+
+ /**
+ * Sync Stats object to individual public fields (called by Jackson after deserialization).
+ *
+ * @param stats the deserialized stats object
+ */
+ @JacksonXmlProperty(localName = "stats")
+ public void setStats(Stats stats) {
+ this.statsObj = stats;
+ this.str = stats.str;
+ this.con = stats.con;
+ this.dex = stats.dex;
+ this.iq = stats.iq;
+ this.wis = stats.wis;
+ this.cha = stats.cha;
+ }
+
+ /**
+ * Get Stats object for serialization (creates from public fields).
+ *
+ * @return stats object
+ */
+ public Stats getStats() {
+ Stats s = new Stats();
+ s.str = this.str;
+ s.con = this.con;
+ s.dex = this.dex;
+ s.iq = this.iq;
+ s.wis = this.wis;
+ s.cha = this.cha;
+ return s;
+ }
+
+ /**
+ * Sync AIConfig object to individual public fields (called by Jackson after deserialization).
+ *
+ * @param ai the deserialized AI config
+ */
+ @JacksonXmlProperty(localName = "ai")
+ public void setAi(AIConfig ai) {
+ this.aiObj = ai;
+ this.aiType = ai.aiType;
+ this.aiRange = ai.aiRange;
+ this.aiAggr = ai.aiAggr;
+ this.aiConf = ai.aiConf;
+ }
+
+ /**
+ * Sync skills map (called by Jackson after deserialization).
+ *
+ * @param skillsMap the deserialized skills map
+ */
+ @JacksonXmlProperty(localName = "skills")
+ public void setSkills(
+ @JsonDeserialize(using = SkillMapDeserializer.class) EnumMap skillsMap) {
+ if (skillsMap != null) {
+ this.skills.putAll(skillsMap);
+ }
+ }
+
+ /**
+ * Get skills for serialization (only non-zero values).
+ *
+ * @return skills map
+ */
+ public EnumMap getSkills() {
+ return skills;
+ }
+
+ /**
+ * Get AIConfig object for serialization (creates from public fields).
+ *
+ * @return AI config object, or null if all defaults
+ */
+ public AIConfig getAi() {
+ if (aiAggr == 0 && aiConf == 0 && aiRange == 10 && aiType == AIType.guard) {
+ return null; // All defaults, don't serialize
+ }
+ AIConfig ai = new AIConfig();
+ ai.aiType = this.aiType;
+ ai.aiRange = this.aiRange;
+ ai.aiAggr = this.aiAggr;
+ ai.aiConf = this.aiConf;
+ return ai;
+ }
+
+ /**
+ * Sync AV element to public field (called by Jackson after deserialization).
+ *
+ * @param avElement the deserialized av element
+ */
+ @JacksonXmlProperty(localName = "av")
+ public void setAv(AVElement avElement) {
+ this.avElement = avElement;
+ this.av = (avElement != null && avElement.value != null) ? avElement.value : "1d1";
+ }
+
+ /**
+ * Sync DV element to public field (called by Jackson after deserialization).
+ *
+ * @param dvElement the deserialized dv element
+ */
+ @JacksonXmlProperty(localName = "dv")
+ public void setDv(DVElement dvElement) {
+ this.dvElement = dvElement;
+ this.dv = (dvElement != null && dvElement.value != null) ? dvElement.value : 0;
+ }
+
+ /**
+ * Get AV element for serialization.
+ *
+ * @return av element
+ */
+ public AVElement getAv() {
+ AVElement elem = new AVElement();
+ elem.value = av;
+ return elem;
+ }
+
+ /**
+ * Get DV element for serialization.
+ *
+ * @return dv element or null if 0
+ */
+ public DVElement getDv() {
+ if (dv > 0) {
+ DVElement elem = new DVElement();
+ elem.value = dv;
+ return elem;
+ }
+ return null;
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public RCreature() {
+ super("unknown");
+ subtypes = new ArrayList<>();
+ skills = new EnumMap<>(Skill.class);
+ // Initialize all skills to 0.0f
+ for (Skill skill : Skill.values()) {
+ skills.put(skill, 0f);
+ }
+ }
+
+ public RCreature(String id, String... path) {
+ super(id, path);
+ subtypes = new ArrayList();
+ skills = new EnumMap(Skill.class);
+ hit = "1d1";
+ av = "1d1";
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public RCreature(Element properties, String... path) {
+ super(properties, path);
+ subtypes = new ArrayList();
+ skills = initSkills(properties.getChild("skills"));
+
+ color = properties.getAttributeValue("color");
+ hit = properties.getAttributeValue("hit");
+ av = properties.getChild("av").getText();
+ text = properties.getAttributeValue("char");
+
+ size = Size.valueOf(properties.getAttributeValue("size"));
+ type = Type.valueOf(properties.getName());
+
+ str = Integer.parseInt(properties.getChild("stats").getAttributeValue("str"));
+ con = Integer.parseInt(properties.getChild("stats").getAttributeValue("con"));
+ dex = Integer.parseInt(properties.getChild("stats").getAttributeValue("dex"));
+ iq = Integer.parseInt(properties.getChild("stats").getAttributeValue("int"));
+ wis = Integer.parseInt(properties.getChild("stats").getAttributeValue("wis"));
+ cha = Integer.parseInt(properties.getChild("stats").getAttributeValue("cha"));
+
+ speed = Integer.parseInt(properties.getAttributeValue("speed"));
+ if (properties.getAttributeValue("mana") != null) { // not always present
+ mana = Integer.parseInt(properties.getAttributeValue("mana"));
+ }
+ if (properties.getChild("dv") != null) { // not always present
+ dv = Integer.parseInt(properties.getChild("dv").getText());
+ }
+
+ if (properties.getAttribute("habitat") != null) {
+ habitat = Habitat.valueOf(properties.getAttributeValue("habitat").toUpperCase());
+ }
+
+ Element brain = properties.getChild("ai");
+ if (brain != null) {
+ if (!brain.getText().isEmpty()) {
+ aiType = AIType.valueOf(brain.getText());
+ }
+ if (brain.getAttributeValue("r") != null) {
+ aiRange = Integer.parseInt(brain.getAttributeValue("r"));
+ }
+ if (brain.getAttributeValue("a") != null) {
+ aiAggr = Integer.parseInt(brain.getAttributeValue("a"));
+ }
+ if (brain.getAttributeValue("c") != null) {
+ aiConf = Integer.parseInt(brain.getAttributeValue("c"));
+ }
+ }
+ }
+
+ public String getName() {
+ return name != null ? name : id;
+ }
+
+ private static EnumMap initSkills(Element skills) {
+ EnumMap list = new EnumMap(Skill.class);
+ for (Skill skill : Skill.values()) {
+ if (skills != null && skills.getAttribute(skill.toString().toLowerCase()) != null) {
+ list.put(skill, Float.parseFloat(skills.getAttributeValue(skill.toString().toLowerCase())));
+ } else {
+ list.put(skill, 0f);
+ }
+ }
+ return list;
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ @Override
+ public Element toElement() {
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ Element element =
+ new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+
+ // Fix root element name to match type (Jackson uses generic name)
+ element.setName(type.toString());
+
+ return element;
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize RCreature to Element", e);
+ }
+ }
+
+ /**
+ * Creates a deep copy of this creature resource.
+ *
+ * Used by GameLoader for player initialization to create an independent copy of the player's
+ * species template. The clone is created via Jackson serialization/deserialization to ensure all
+ * fields are properly copied.
+ *
+ * @return independent copy of this creature with all fields duplicated
+ * @throws RuntimeException if cloning fails
+ */
+ public RCreature clone() {
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ RCreature copy = mapper.fromXml(xml, RCreature.class);
+
+ // Preserve path which isn't serialized by Jackson
+ if (this.path != null) {
+ copy.path = this.path.clone();
+ }
+
+ return copy;
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to clone RCreature: " + id, e);
+ }
+ }
+}
diff --git a/src/main/java/neon/resources/RData.java b/src/main/java/neon/resources/RData.java
index aa57080..6c8d89d 100644
--- a/src/main/java/neon/resources/RData.java
+++ b/src/main/java/neon/resources/RData.java
@@ -18,6 +18,7 @@
package neon.resources;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import java.io.Serializable;
import org.jdom2.Element;
@@ -28,8 +29,13 @@
*/
public abstract class RData extends Resource implements Serializable {
// this is actually only for items and creatures
+ @JacksonXmlProperty(isAttribute = true, localName = "char")
public String text = "x";
+
+ @JacksonXmlProperty(isAttribute = true)
public String color = "white";
+
+ @JacksonXmlProperty(isAttribute = true)
public String name;
/**
diff --git a/src/main/java/neon/resources/RDungeonTheme.java b/src/main/java/neon/resources/RDungeonTheme.java
index acc6e31..ea96917 100644
--- a/src/main/java/neon/resources/RDungeonTheme.java
+++ b/src/main/java/neon/resources/RDungeonTheme.java
@@ -1,48 +1,76 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2012 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import org.jdom2.Element;
-
-public class RDungeonTheme extends RData {
- public int min, max, branching;
- public String zones;
-
- public RDungeonTheme(String id, String... path) {
- super(id, path);
- }
-
- public RDungeonTheme(Element props, String... path) {
- super(props.getAttributeValue("id"), path);
- min = Integer.parseInt(props.getAttributeValue("min"));
- max = Integer.parseInt(props.getAttributeValue("max"));
- branching = Integer.parseInt(props.getAttributeValue("b"));
- zones = props.getAttributeValue("zones");
- }
-
- public Element toElement() {
- Element theme = new Element("dungeon");
- theme.setAttribute("id", id);
- theme.setAttribute("min", Integer.toString(min));
- theme.setAttribute("max", Integer.toString(max));
- theme.setAttribute("b", Integer.toString(branching));
- theme.setAttribute("zones", zones);
- return theme;
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.ByteArrayInputStream;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+@JacksonXmlRootElement(localName = "dungeon")
+public class RDungeonTheme extends RData {
+ @JacksonXmlProperty(isAttribute = true)
+ public int min;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public int max;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "b")
+ public int branching;
+
+ @JacksonXmlProperty(isAttribute = true)
+ @JsonProperty(required = false)
+ public String zones;
+
+ // No-arg constructor for Jackson deserialization
+ public RDungeonTheme() {
+ super("unknown");
+ }
+
+ public RDungeonTheme(String id, String... path) {
+ super(id, path);
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public RDungeonTheme(Element props, String... path) {
+ super(props.getAttributeValue("id"), path);
+ min = Integer.parseInt(props.getAttributeValue("min"));
+ max = Integer.parseInt(props.getAttributeValue("max"));
+ branching = Integer.parseInt(props.getAttributeValue("b"));
+ zones = props.getAttributeValue("zones");
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ public Element toElement() {
+ try {
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ return new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize RDungeonTheme to Element", e);
+ }
+ }
+}
diff --git a/src/main/java/neon/resources/RItem.java b/src/main/java/neon/resources/RItem.java
index 4d4873f..6ddb3df 100644
--- a/src/main/java/neon/resources/RItem.java
+++ b/src/main/java/neon/resources/RItem.java
@@ -1,193 +1,355 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2012 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.io.ByteArrayInputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import org.jdom2.Element;
-import org.jdom2.input.SAXBuilder;
-import org.jdom2.output.XMLOutputter;
-
-public class RItem extends RData implements Serializable {
- public enum Type {
- aid,
- armor,
- book,
- clothing,
- coin,
- container,
- door,
- food,
- item,
- light,
- potion,
- scroll,
- weapon;
- }
-
- private static XMLOutputter outputter = new XMLOutputter();
- private static SAXBuilder builder = new SAXBuilder();
-
- public int cost;
- public float weight;
- public boolean top;
- public Type type;
- public String spell;
- public String svg;
-
- public RItem(Element item, String... path) {
- super(item, path);
- type = Type.valueOf(item.getName());
- if (item.getAttribute("cost") != null) {
- cost = Integer.parseInt(item.getAttributeValue("cost"));
- }
- if (item.getAttribute("weight") != null) {
- weight = Float.parseFloat(item.getAttributeValue("weight"));
- }
- top = item.getAttribute("z") != null;
- if (item.getAttribute("spell") != null) {
- spell = item.getAttributeValue("spell");
- }
- if (item.getChild("svg") != null) {
- svg = outputter.outputString((Element) item.getChild("svg").getChildren().get(0));
- }
- }
-
- public RItem(String id, Type type, String... path) {
- super(id, path);
- this.type = type;
- }
-
- public Element toElement() {
- Element item = new Element(type.toString());
- item.setAttribute("id", id);
- if (svg != null) {
- try {
- Element graphics = new Element("svg");
- ByteArrayInputStream stream = new ByteArrayInputStream(svg.getBytes("UTF-8"));
- Element shape = (Element) builder.build(stream).getRootElement().detach();
- graphics.addContent(shape);
- item.addContent(graphics);
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else {
- item.setAttribute("char", text);
- item.setAttribute("color", color);
- }
-
- if (top) {
- item.setAttribute("z", "top");
- }
- if (cost > 0) {
- item.setAttribute("cost", Integer.toString(cost));
- }
- if (weight > 0) {
- item.setAttribute("weight", Float.toString(weight));
- }
- if (name != null && !name.isEmpty()) {
- item.setAttribute("name", name);
- }
- if (spell != null) {
- item.setAttribute("spell", spell);
- }
-
- return item;
- }
-
- public static class Door extends RItem implements Serializable {
- public String closed = " ";
- public String locked = " ";
-
- public Door(Element door, String... path) {
- super(door, path);
- Element states = door.getChild("states");
- if (states != null) {
- if (states.getAttribute("closed") != null) {
- closed = states.getAttributeValue("closed");
- } else {
- closed = text;
- }
- if (states.getAttribute("locked") != null) {
- locked = states.getAttributeValue("locked");
- } else {
- locked = closed;
- }
- }
- }
-
- public Door(String id, Type type, String... path) {
- super(id, type, path);
- }
-
- @Override
- public Element toElement() {
- Element door = super.toElement();
- if ((!closed.equals(text) && !closed.equals(" "))
- || (!locked.equals(closed) && !locked.equals(" "))) {
- Element states = new Element("states");
- if (!closed.equals(text) && !closed.equals(" ")) {
- states.setAttribute("closed", closed);
- }
- if (!locked.equals(closed) && !locked.equals(" ")) {
- states.setAttribute("locked", locked);
- }
- door.addContent(states);
- }
- return door;
- }
- }
-
- public static class Potion extends RItem implements Serializable {
- public Potion(Element potion, String... path) {
- super(potion, path);
- }
- }
-
- public static class Container extends RItem implements Serializable {
- public ArrayList contents = new ArrayList();
-
- public Container(Element container, String... path) {
- super(container, path);
- for (Element item : container.getChildren("item")) {
- contents.add(item.getText());
- }
- }
- }
-
- public static class Text extends RItem implements Serializable {
- public String content;
-
- public Text(Element text, String... path) {
- super(text, path);
- content = text.getText();
- }
-
- public Text(String id, Type type, String... path) {
- super(id, type, path);
- }
-
- public Element toElement() {
- Element book = super.toElement();
- book.setText(content);
- return book;
- }
- }
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2012 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
+import java.io.ByteArrayInputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
+
+@JacksonXmlRootElement // No localName - accepts any element name (weapon, armor, etc.)
+public class RItem extends RData implements Serializable {
+ public enum Type {
+ aid,
+ armor,
+ book,
+ clothing,
+ coin,
+ container,
+ door,
+ food,
+ item,
+ light,
+ potion,
+ scroll,
+ weapon;
+ }
+
+ private static XMLOutputter outputter = new XMLOutputter();
+ private static SAXBuilder builder = new SAXBuilder();
+
+ @JacksonXmlProperty(isAttribute = true)
+ @JsonProperty(required = false)
+ public int cost;
+
+ @JacksonXmlProperty(isAttribute = true)
+ @JsonProperty(required = false)
+ public float weight;
+
+ @JacksonXmlProperty(isAttribute = true, localName = "z")
+ @JsonProperty(required = false)
+ private String zAttribute; // "top" or null
+
+ public boolean top;
+ public Type type;
+
+ @JacksonXmlProperty(isAttribute = true)
+ @JsonProperty(required = false)
+ public String spell;
+
+ // SVG content stored in a wrapper to properly deserialize inner XML
+ @JacksonXmlProperty(localName = "svg")
+ @JsonProperty(required = false)
+ private SvgWrapper svgWrapper;
+
+ // Public field for backward compatibility
+ @com.fasterxml.jackson.annotation.JsonIgnore public String svg;
+
+ /**
+ * Get SVG content.
+ *
+ * @return SVG content string
+ */
+ @com.fasterxml.jackson.annotation.JsonIgnore
+ public String getSvg() {
+ return svg;
+ }
+
+ /**
+ * Set SVG content (used by Jackson deserialization).
+ *
+ * @param wrapper the SVG wrapper
+ */
+ @JsonSetter("svg")
+ private void setSvgWrapper(SvgWrapper wrapper) {
+ this.svgWrapper = wrapper;
+ this.svg = (wrapper != null && wrapper.content != null) ? wrapper.content.trim() : null;
+ }
+
+ /**
+ * Get SVG wrapper for serialization (used by Jackson serialization).
+ *
+ * @return SVG wrapper or null if no SVG content
+ */
+ @com.fasterxml.jackson.annotation.JsonGetter("svg")
+ private SvgWrapper getSvgWrapper() {
+ if (svg == null || svg.isEmpty()) {
+ return null;
+ }
+ SvgWrapper wrapper = new SvgWrapper();
+ wrapper.content = svg;
+ return wrapper;
+ }
+
+ /** Wrapper class to deserialize/serialize SVG child element. */
+ private static class SvgWrapper implements Serializable {
+ @JacksonXmlText public String content;
+
+ public SvgWrapper() {}
+ }
+
+ /**
+ * Sync z attribute to top field (called by Jackson after deserialization).
+ *
+ * @param zValue the z attribute value
+ */
+ public void setZ(String zValue) {
+ this.zAttribute = zValue;
+ this.top = zValue != null;
+ }
+
+ /**
+ * Get z attribute for serialization.
+ *
+ * @return z attribute or null
+ */
+ public String getZ() {
+ return top ? "top" : null;
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public RItem() {
+ super("unknown");
+ this.type = Type.item; // Default type for generic items
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public RItem(Element item, String... path) {
+ super(item, path);
+ type = Type.valueOf(item.getName());
+ if (item.getAttribute("cost") != null) {
+ cost = Integer.parseInt(item.getAttributeValue("cost"));
+ }
+ if (item.getAttribute("weight") != null) {
+ weight = Float.parseFloat(item.getAttributeValue("weight"));
+ }
+ top = item.getAttribute("z") != null;
+ if (item.getAttribute("spell") != null) {
+ spell = item.getAttributeValue("spell");
+ }
+ if (item.getChild("svg") != null) {
+ svg = outputter.outputString((Element) item.getChild("svg").getChildren().get(0));
+ }
+ }
+
+ public RItem(String id, Type type, String... path) {
+ super(id, path);
+ this.type = type;
+ }
+
+ /**
+ * Creates a JDOM Element from this resource using Jackson serialization.
+ *
+ * @return JDOM Element representation
+ */
+ public Element toElement() {
+ try {
+ neon.systems.files.JacksonMapper mapper = new neon.systems.files.JacksonMapper();
+ String xml = mapper.toXml(this).toString();
+ Element element =
+ new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+
+ // Fix root element name to match type (Jackson uses generic name)
+ element.setName(type.toString());
+
+ return element;
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize RItem to Element", e);
+ }
+ }
+
+ public static class Door extends RItem implements Serializable {
+ @com.fasterxml.jackson.annotation.JsonIgnore public String closed = " ";
+
+ @com.fasterxml.jackson.annotation.JsonIgnore public String locked = " ";
+
+ /** Inner class for door states */
+ public static class States implements Serializable {
+ @JacksonXmlProperty(isAttribute = true)
+ public String closed;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public String locked;
+ }
+
+ @com.fasterxml.jackson.annotation.JsonIgnore private States statesElement;
+
+ /** Called by Jackson after deserialization to sync states to fields */
+ @com.fasterxml.jackson.annotation.JsonSetter("states")
+ public void setStatesElement(States states) {
+ this.statesElement = states;
+ if (states != null) {
+ if (states.closed != null) {
+ this.closed = states.closed;
+ }
+ if (states.locked != null) {
+ this.locked = states.locked;
+ }
+ }
+ }
+
+ /**
+ * Get States object for serialization (creates from public fields).
+ *
+ * @return states object or null if all defaults
+ */
+ @com.fasterxml.jackson.annotation.JsonGetter("states")
+ public States getStatesElement() {
+ // Only serialize if values differ from defaults
+ if ((!closed.equals(text) && !closed.equals(" "))
+ || (!locked.equals(closed) && !locked.equals(" "))) {
+ States states = new States();
+ if (!closed.equals(text) && !closed.equals(" ")) {
+ states.closed = closed;
+ }
+ if (!locked.equals(closed) && !locked.equals(" ")) {
+ states.locked = locked;
+ }
+ return states;
+ }
+ return null;
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public Door() {
+ super();
+ this.type = Type.door;
+ }
+
+ public Door(Element door, String... path) {
+ super(door, path);
+ Element states = door.getChild("states");
+ if (states != null) {
+ if (states.getAttribute("closed") != null) {
+ closed = states.getAttributeValue("closed");
+ } else {
+ closed = text;
+ }
+ if (states.getAttribute("locked") != null) {
+ locked = states.getAttributeValue("locked");
+ } else {
+ locked = closed;
+ }
+ }
+ }
+
+ public Door(String id, Type type, String... path) {
+ super(id, type, path);
+ }
+
+ @Override
+ public Element toElement() {
+ Element door = super.toElement();
+ if ((!closed.equals(text) && !closed.equals(" "))
+ || (!locked.equals(closed) && !locked.equals(" "))) {
+ Element states = new Element("states");
+ if (!closed.equals(text) && !closed.equals(" ")) {
+ states.setAttribute("closed", closed);
+ }
+ if (!locked.equals(closed) && !locked.equals(" ")) {
+ states.setAttribute("locked", locked);
+ }
+ door.addContent(states);
+ }
+ return door;
+ }
+ }
+
+ public static class Potion extends RItem implements Serializable {
+ // No-arg constructor for Jackson deserialization
+ public Potion() {
+ super();
+ this.type = Type.potion;
+ }
+
+ public Potion(Element potion, String... path) {
+ super(potion, path);
+ }
+
+ public Potion(String id, Type type, String... path) {
+ super(id, type, path);
+ }
+ }
+
+ public static class Container extends RItem implements Serializable {
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "item")
+ public ArrayList contents = new ArrayList();
+
+ // No-arg constructor for Jackson deserialization
+ public Container() {
+ super();
+ this.type = Type.container;
+ }
+
+ public Container(Element container, String... path) {
+ super(container, path);
+ for (Element item : container.getChildren("item")) {
+ contents.add(item.getText());
+ }
+ }
+
+ public Container(String id, Type type, String... path) {
+ super(id, type, path);
+ }
+ }
+
+ public static class Text extends RItem implements Serializable {
+ @com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText public String content;
+
+ // No-arg constructor for Jackson deserialization
+ public Text() {
+ super();
+ this.type = Type.book; // Default to book, can also be scroll
+ }
+
+ public Text(Element text, String... path) {
+ super(text, path);
+ content = text.getText();
+ }
+
+ public Text(String id, Type type, String... path) {
+ super(id, type, path);
+ }
+
+ public Element toElement() {
+ Element book = super.toElement();
+ book.setText(content);
+ return book;
+ }
+ }
+}
diff --git a/src/main/java/neon/resources/RMod.java b/src/main/java/neon/resources/RMod.java
index 10b4e8a..11b45c8 100644
--- a/src/main/java/neon/resources/RMod.java
+++ b/src/main/java/neon/resources/RMod.java
@@ -1,160 +1,279 @@
-/*
- * Neon, a roguelike engine.
- * Copyright (C) 2013 - Maarten Driesen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package neon.resources;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import org.jdom2.Element;
-
-public class RMod extends Resource {
- public ArrayList ccItems = new ArrayList();
- public ArrayList ccRaces = new ArrayList();
- public ArrayList ccSpells = new ArrayList();
- private HashMap info = new HashMap();
- private ArrayList maps = new ArrayList();
-
- public RMod(Element main, Element cc, String... path) {
- super(main.getAttributeValue("id"), path);
-
- // main.xml
- info.put("id", main.getAttributeValue("id"));
- info.put("master", main.getChildText("master"));
- if (main.getChildText("title") != null) {
- info.put("title", main.getChildText("title"));
- }
- if (main.getChild("currency") != null) {
- info.put("big", main.getChild("currency").getAttributeValue("big"));
- info.put("small", main.getChild("currency").getAttributeValue("small"));
- }
-
- // cc.xml
- if (cc != null) { // strings here, because resources are not yet loaded
- for (Element race : cc.getChildren("race")) {
- ccRaces.add(race.getText());
- }
- for (Element item : cc.getChildren("item")) {
- ccItems.add(item.getText());
- }
- for (Element spell : cc.getChildren("spell")) {
- ccSpells.add(spell.getText());
- }
- if (cc.getChild("map") != null) {
- info.put("map", cc.getChild("map").getAttributeValue("path"));
- info.put("x", cc.getChild("map").getAttributeValue("x"));
- info.put("y", cc.getChild("map").getAttributeValue("y"));
- info.put("z", cc.getChild("map").getAttributeValue("z"));
- }
- }
- }
-
- /**
- * @return the root element of the main.xml file for this mod.
- */
- public Element getMainElement() {
- Element main = new Element(isExtension() ? "extension" : "master");
- main.setAttribute("id", info.get("id"));
- if (info.get("title") != null) {
- main.addContent(new Element("title").setText(info.get("title")));
- }
- if (info.get("big") != null || info.get("small") != null) {
- Element currency = new Element("currency");
- currency.setAttribute("big", info.get("big"));
- currency.setAttribute("small", info.get("small"));
- main.addContent("currency");
- }
- return main;
- }
-
- /**
- * @return the root element of the cc.xml file for this mod.
- */
- public Element getCCElement() {
- Element cc = new Element("cc");
- for (String item : ccItems) {
- cc.addContent(new Element("item").setText(item));
- }
- for (String spell : ccSpells) {
- cc.addContent(new Element("spell").setText(spell));
- }
- for (String race : ccRaces) {
- cc.addContent(new Element("race").setText(race));
- }
- if (info.get("map") != null) {
- Element map = new Element("map");
- map.setAttribute("path", info.get("map"));
- map.setAttribute("x", info.get("x"));
- map.setAttribute("y", info.get("y"));
- if (info.get("z") != null) {
- map.setAttribute("z", info.get("z"));
- }
- cc.addContent(map);
- }
- return cc;
- }
-
- public List getList(String key) {
- ArrayList list = new ArrayList();
- if (key.equals("items")) {
- list.addAll(ccItems);
- } else if (key.equals("spells")) {
- list.addAll(ccSpells);
- } else if (key.equals("races")) {
- list.addAll(ccRaces);
- }
- return list;
- }
-
- /**
- * @return whether this is an extension mod or not.
- */
- public boolean isExtension() {
- return info.get("master") != null;
- }
-
- public String get(String key) {
- if (info.get(key) != null) {
- return info.get(key);
- } else {
- return null;
- }
- }
-
- public void set(String key, String value) {
- info.put(key, value);
- }
-
- /**
- * @return a list with the paths to all maps in this mod
- */
- public Collection getMaps() {
- return maps;
- }
-
- public void addMaps(ArrayList maps) {
- this.maps.addAll(maps);
- }
-
- @Override
- public void load() {}
-
- @Override
- public void unload() {}
-}
+/*
+ * Neon, a roguelike engine.
+ * Copyright (C) 2013 - Maarten Driesen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package neon.resources;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import neon.systems.files.JacksonMapper;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+
+public class RMod extends Resource {
+ public ArrayList ccItems = new ArrayList();
+ public ArrayList ccRaces = new ArrayList();
+ public ArrayList ccSpells = new ArrayList();
+ private HashMap info = new HashMap();
+ private ArrayList maps = new ArrayList();
+
+ /** Jackson model for main.xml */
+ @JacksonXmlRootElement
+ public static class MainXml {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+
+ @JacksonXmlProperty(localName = "title")
+ @JsonProperty(required = false)
+ public String title;
+
+ @JacksonXmlProperty(localName = "currency")
+ @JsonProperty(required = false)
+ public Currency currency;
+
+ @JacksonXmlProperty(localName = "master")
+ @JsonProperty(required = false)
+ public String master;
+
+ public static class Currency {
+ @JacksonXmlProperty(isAttribute = true)
+ public String big;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public String small;
+ }
+ }
+
+ /** Jackson model for cc.xml */
+ @JacksonXmlRootElement(localName = "root")
+ public static class CCXml {
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "race")
+ public List races = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "item")
+ public List items = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "spell")
+ public List spells = new ArrayList<>();
+
+ @JacksonXmlProperty(localName = "map")
+ @JsonProperty(required = false)
+ public MapStart map;
+
+ public static class MapStart {
+ @JacksonXmlProperty(isAttribute = true)
+ public String path;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public String x;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public String y;
+
+ @JacksonXmlProperty(isAttribute = true)
+ @JsonProperty(required = false)
+ public String z;
+ }
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public RMod() {
+ super("unknown");
+ }
+
+ // Jackson constructor
+ public RMod(MainXml main, CCXml cc, String... path) {
+ super(main.id, path);
+
+ // main.xml
+ info.put("id", main.id);
+ if (main.master != null) {
+ info.put("master", main.master);
+ }
+ if (main.title != null) {
+ info.put("title", main.title);
+ }
+ if (main.currency != null) {
+ info.put("big", main.currency.big);
+ info.put("small", main.currency.small);
+ }
+
+ // cc.xml
+ if (cc != null) {
+ ccRaces.addAll(cc.races);
+ ccItems.addAll(cc.items);
+ ccSpells.addAll(cc.spells);
+ if (cc.map != null) {
+ info.put("map", cc.map.path);
+ info.put("x", cc.map.x);
+ info.put("y", cc.map.y);
+ if (cc.map.z != null) {
+ info.put("z", cc.map.z);
+ }
+ }
+ }
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
+ public RMod(Element main, Element cc, String... path) {
+ super(main.getAttributeValue("id"), path);
+
+ // main.xml
+ info.put("id", main.getAttributeValue("id"));
+ info.put("master", main.getChildText("master"));
+ if (main.getChildText("title") != null) {
+ info.put("title", main.getChildText("title"));
+ }
+ if (main.getChild("currency") != null) {
+ info.put("big", main.getChild("currency").getAttributeValue("big"));
+ info.put("small", main.getChild("currency").getAttributeValue("small"));
+ }
+
+ // cc.xml
+ if (cc != null) { // strings here, because resources are not yet loaded
+ for (Element race : cc.getChildren("race")) {
+ ccRaces.add(race.getText());
+ }
+ for (Element item : cc.getChildren("item")) {
+ ccItems.add(item.getText());
+ }
+ for (Element spell : cc.getChildren("spell")) {
+ ccSpells.add(spell.getText());
+ }
+ if (cc.getChild("map") != null) {
+ info.put("map", cc.getChild("map").getAttributeValue("path"));
+ info.put("x", cc.getChild("map").getAttributeValue("x"));
+ info.put("y", cc.getChild("map").getAttributeValue("y"));
+ info.put("z", cc.getChild("map").getAttributeValue("z"));
+ }
+ }
+ }
+
+ /**
+ * @return the root element of the main.xml file for this mod using Jackson serialization.
+ */
+ public Element getMainElement() {
+ try {
+ MainXml main = new MainXml();
+ main.id = info.get("id");
+ main.title = info.get("title");
+ if (info.get("big") != null || info.get("small") != null) {
+ main.currency = new MainXml.Currency();
+ main.currency.big = info.get("big");
+ main.currency.small = info.get("small");
+ }
+ if (isExtension()) {
+ main.master = info.get("master");
+ }
+
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(main).toString();
+ Element element =
+ new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ // Set correct root element name
+ element.setName(isExtension() ? "extension" : "master");
+ return element;
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize RMod main to Element", e);
+ }
+ }
+
+ /**
+ * @return the root element of the cc.xml file for this mod using Jackson serialization.
+ */
+ public Element getCCElement() {
+ try {
+ CCXml cc = new CCXml();
+ cc.items.addAll(ccItems);
+ cc.spells.addAll(ccSpells);
+ cc.races.addAll(ccRaces);
+ if (info.get("map") != null) {
+ cc.map = new CCXml.MapStart();
+ cc.map.path = info.get("map");
+ cc.map.x = info.get("x");
+ cc.map.y = info.get("y");
+ cc.map.z = info.get("z");
+ }
+
+ JacksonMapper mapper = new JacksonMapper();
+ String xml = mapper.toXml(cc).toString();
+ Element element =
+ new SAXBuilder().build(new ByteArrayInputStream(xml.getBytes())).getRootElement();
+ return element;
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to serialize RMod cc to Element", e);
+ }
+ }
+
+ public List getList(String key) {
+ ArrayList list = new ArrayList();
+ if (key.equals("items")) {
+ list.addAll(ccItems);
+ } else if (key.equals("spells")) {
+ list.addAll(ccSpells);
+ } else if (key.equals("races")) {
+ list.addAll(ccRaces);
+ }
+ return list;
+ }
+
+ /**
+ * @return whether this is an extension mod or not.
+ */
+ public boolean isExtension() {
+ return info.get("master") != null;
+ }
+
+ public String get(String key) {
+ if (info.get(key) != null) {
+ return info.get(key);
+ } else {
+ return null;
+ }
+ }
+
+ public void set(String key, String value) {
+ info.put(key, value);
+ }
+
+ /**
+ * @return a list with the paths to all maps in this mod
+ */
+ public Collection getMaps() {
+ return maps;
+ }
+
+ public void addMaps(ArrayList maps) {
+ this.maps.addAll(maps);
+ }
+
+ @Override
+ public void load() {}
+
+ @Override
+ public void unload() {}
+}
diff --git a/src/main/java/neon/resources/RPerson.java b/src/main/java/neon/resources/RPerson.java
index ccb93e7..423412d 100644
--- a/src/main/java/neon/resources/RPerson.java
+++ b/src/main/java/neon/resources/RPerson.java
@@ -18,22 +18,118 @@
package neon.resources;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
+import java.io.ByteArrayInputStream;
import java.util.*;
import neon.entities.property.Skill;
import neon.resources.RCreature.AIType;
+import neon.systems.files.JacksonMapper;
import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+@JacksonXmlRootElement(localName = "npc")
public class RPerson extends RData {
- public HashMap factions = new HashMap();
+ @JsonIgnore public HashMap factions = new HashMap();
public AIType aiType;
- public int aiRange, aiConf, aiAggr;
- public HashMap skills = new HashMap();
- public HashSet spells = new HashSet();
- public ArrayList items = new ArrayList();
- public ArrayList scripts = new ArrayList();
- public List services = new ArrayList();
+ public int aiRange = -1, aiConf = -1, aiAggr = -1;
+ @JsonIgnore public HashMap skills = new HashMap();
+ @JsonIgnore public HashSet spells = new HashSet();
+ @JsonIgnore public ArrayList items = new ArrayList();
+ @JsonIgnore public ArrayList scripts = new ArrayList();
+ @JsonIgnore public ArrayList services = new ArrayList();
+
+ @JacksonXmlProperty(isAttribute = true, localName = "race")
public String species;
+ /** Inner class for faction entries */
+ public static class FactionEntry {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public int rank;
+ }
+
+ /** Inner class for skill entries */
+ public static class SkillEntry {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public int rank;
+ }
+
+ /** Inner class for item entries */
+ public static class ItemEntry {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+ }
+
+ /** Inner class for spell entries */
+ public static class SpellEntry {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+ }
+
+ /** Inner class for AI configuration */
+ @JacksonXmlRootElement(localName = "ai")
+ public static class AI {
+ @JacksonXmlProperty(isAttribute = true, localName = "r")
+ public Integer r; // range
+
+ @JacksonXmlProperty(isAttribute = true, localName = "a")
+ public Integer a; // aggression
+
+ @JacksonXmlProperty(isAttribute = true, localName = "c")
+ public Integer c; // confidence
+
+ @JacksonXmlText public String type; // AI type
+ }
+
+ /** Inner class for service definitions */
+ @JacksonXmlRootElement(localName = "service")
+ public static class Service {
+ @JacksonXmlProperty(isAttribute = true)
+ public String id;
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "skill")
+ public List skills = new ArrayList<>();
+
+ @JacksonXmlElementWrapper(useWrapping = false)
+ @JacksonXmlProperty(localName = "dest")
+ public List destinations = new ArrayList<>();
+
+ /** Inner class for travel destinations */
+ public static class Destination {
+ @JacksonXmlProperty(isAttribute = true)
+ public int x;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public int y;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public String name;
+
+ @JacksonXmlProperty(isAttribute = true)
+ public int cost;
+ }
+ }
+
+ // No-arg constructor for Jackson deserialization
+ public RPerson() {
+ super("unknown");
+ }
+
+ public RPerson(String id, String... path) {
+ super(id, path);
+ }
+
+ // Keep JDOM constructor for backward compatibility during migration
public RPerson(Element person, String... path) {
super(person.getAttributeValue("id"), path);
name = person.getAttributeValue("name");
@@ -92,9 +188,27 @@ public RPerson(Element person, String... path) {
}
}
- // new arraylist to avoid ConcurrentModificationExceptions
- for (Element service : new ArrayList(person.getChildren("service"))) {
- services.add(service.detach());
+ // Parse services into Service objects
+ for (Element serviceEl : person.getChildren("service")) {
+ Service service = new Service();
+ service.id = serviceEl.getAttributeValue("id");
+
+ // Training service - has skill children
+ for (Element skillEl : serviceEl.getChildren("skill")) {
+ service.skills.add(skillEl.getText());
+ }
+
+ // Travel service - has dest children
+ for (Element destEl : serviceEl.getChildren("dest")) {
+ Service.Destination dest = new Service.Destination();
+ dest.x = Integer.parseInt(destEl.getAttributeValue("x"));
+ dest.y = Integer.parseInt(destEl.getAttributeValue("y"));
+ dest.name = destEl.getAttributeValue("name");
+ dest.cost = Integer.parseInt(destEl.getAttributeValue("cost"));
+ service.destinations.add(dest);
+ }
+
+ services.add(service);
}
for (Element script : person.getChildren("script")) {
@@ -102,68 +216,171 @@ public RPerson(Element person, String... path) {
}
}
- public RPerson(String id, String... path) {
- super(id, path);
+ /** Jackson setter for factions - converts list to HashMap */
+ @JacksonXmlElementWrapper(localName = "factions")
+ @JacksonXmlProperty(localName = "faction")
+ public void setFactionList(List factionList) {
+ if (factionList != null) {
+ for (FactionEntry entry : factionList) {
+ factions.put(entry.id, entry.rank);
+ }
+ }
}
- public Element toElement() {
- Element npc = new Element("npc");
- npc.setAttribute("race", species);
- npc.setAttribute("id", id);
-
- for (Element service : services) {
- service.detach(); // otherwise error on 2nd save
- npc.addContent(service);
- }
-
- if (!factions.isEmpty()) {
- Element factionList = new Element("factions");
- for (String f : factions.keySet()) {
- Element faction = new Element("faction");
- faction.setAttribute("id", f);
- faction.setAttribute("rank", Integer.toString(factions.get(f)));
- factionList.addContent(faction);
- }
- npc.addContent(factionList);
+ /** Jackson getter for factions - converts HashMap to list */
+ @JacksonXmlElementWrapper(localName = "factions")
+ @JacksonXmlProperty(localName = "faction")
+ public List getFactionList() {
+ List list = new ArrayList<>();
+ for (Map.Entry entry : factions.entrySet()) {
+ FactionEntry fe = new FactionEntry();
+ fe.id = entry.getKey();
+ fe.rank = entry.getValue();
+ list.add(fe);
}
+ return list;
+ }
- if (!items.isEmpty()) {
- Element itemList = new Element("items");
- for (String ri : items) {
- Element item = new Element("item");
- item.setAttribute("id", ri);
- itemList.addContent(item);
+ /** Jackson setter for skills - converts list to HashMap */
+ @JacksonXmlElementWrapper(localName = "skills")
+ @JacksonXmlProperty(localName = "skill")
+ public void setSkillList(List skillList) {
+ if (skillList != null) {
+ for (SkillEntry entry : skillList) {
+ skills.put(Skill.valueOf(entry.id.toUpperCase()), entry.rank);
}
- npc.addContent(itemList);
}
+ }
- if (!spells.isEmpty()) {
- Element spellList = new Element("spells");
- for (String rs : spells) {
- Element spell = new Element("spell");
- spell.setAttribute("id", rs);
- spellList.addContent(spell);
- }
- npc.addContent(spellList);
+ /** Jackson getter for skills - converts HashMap to list */
+ @JacksonXmlElementWrapper(localName = "skills")
+ @JacksonXmlProperty(localName = "skill")
+ public List