Ticket #3909: renameTechMan.diff

binaries/data/mods/public/simulation/components/Auras.js

@@ -8 +8 @@
 
 Auras.prototype.Init = function()
 {
-    let cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
+    let cmpJsonTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_JsonTemplateManager);
     this.auras = {};
     this.affectedPlayers = {};
     let auraNames = this.GetAuraNames();
@@ -15 +15 @@
     for (let name of auraNames)
     {
         this.affectedPlayers[name] = [];
-        this.auras[name] = cmpTechnologyTemplateManager.GetAuraTemplate(name);
+        this.auras[name] = cmpJsonTemplateManager.GetAuraTemplate(name);
     }
     // In case of autogarrisoning, this component can be called before ownership is set.
     // So it needs to be completely initialised from the start.

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -591 +591 @@
 
     // Add aura name and description loaded from JSON file
     let auraNames = template.Auras._string.split(/\s+/);
-    let cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
+    let cmpJsonTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_JsonTemplateManager);
     for (let name of auraNames)
     {
-        let auraTemplate = cmpTechnologyTemplateManager.GetAuraTemplate(name);
+        let auraTemplate = cmpJsonTemplateManager.GetAuraTemplate(name);
         if (!auraTemplate)
         {
-            // the following warning is perhaps useless since it's yet done in TechnologyTemplateManager
+            // the following warning is perhaps useless since it's yet done in JsonTemplateManager
             warn("Tried to get data for invalid aura: " + name);
             continue;
         }
@@ -610 +610 @@
 
 GuiInterface.prototype.GetTechnologyData = function(player, name)
 {
-    let cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
-    let template = cmpTechnologyTemplateManager.GetTemplate(name);
+    let cmpJsonTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_JsonTemplateManager);
+    let template = cmpJsonTemplateManager.GetTechnologyTemplate(name);
 
     if (!template)
     {

binaries/data/mods/public/simulation/components/JsonTemplateManager.js

@@ -1 +1 @@
 /**
  * System component which loads the technology and the aura data files
  */
-function TechnologyTemplateManager() {}
+function JsonTemplateManager() {}
 
-TechnologyTemplateManager.prototype.Schema =
+JsonTemplateManager.prototype.Schema =
     "<a:component type='system'/><empty/>";
 
-TechnologyTemplateManager.prototype.Init = function()
+JsonTemplateManager.prototype.Init = function()
 {
     this.allTechs = {};
     this.allAuras = {};
     var techNames = this.ListAllTechs();
     for (var i in techNames)
-        this.GetTemplate(techNames[i]);
+        this.GetTechnologyTemplate(techNames[i]);
 };
 
-TechnologyTemplateManager.prototype.GetTemplate = function(template)
+JsonTemplateManager.prototype.Serialize = null; // we have no dynamic state to save
+
+JsonTemplateManager.prototype.GetTechnologyTemplate = function(template)
 {
     if (!this.allTechs[template])
     {
@@ -27 +29 @@
     return this.allTechs[template];
 };
 
-TechnologyTemplateManager.prototype.GetAuraTemplate = function(template)
+JsonTemplateManager.prototype.GetAuraTemplate = function(template)
 {
     if (!this.allAuras[template])
     {
@@ -39 +41 @@
     return this.allAuras[template];
 };
 
-TechnologyTemplateManager.prototype.ListAllTechs = function()
+JsonTemplateManager.prototype.ListAllTechs = function()
 {
     return Engine.FindJSONFiles("technologies", true);
 };
 
-TechnologyTemplateManager.prototype.GetAllTechs = function()
+JsonTemplateManager.prototype.GetAllTechs = function()
 {
     return this.allTechs;
 };
 
-Engine.RegisterSystemComponentType(IID_TechnologyTemplateManager, "TechnologyTemplateManager", TechnologyTemplateManager);
+Engine.RegisterSystemComponentType(IID_JsonTemplateManager, "JsonTemplateManager", JsonTemplateManager);

binaries/data/mods/public/simulation/components/ProductionQueue.js

@@ -159 +159 @@
 
     // Remove any technologies that can't be searched by this civ (after capture for example)
     techs = techs.filter(tech => {
-        let reqs = cmpTechnologyManager.GetTechnologyTemplate(tech).requirements || null;
+        let reqs = cmpTechnologyManager.GetTemplate(tech).requirements || null;
         return cmpTechnologyManager.CheckTechnologyRequirements(reqs, true);
     });
 
@@ -175 +175 @@
         var tech = techs[i];
         if (disabledTechnologies && disabledTechnologies[tech])
             continue;
-        var template = cmpTechnologyManager.GetTechnologyTemplate(tech);
+        var template = cmpTechnologyManager.GetTemplate(tech);
         if (!template.supersedes || techs.indexOf(template.supersedes) === -1)
             techList.push(tech);
         else
@@ -206 +206 @@
             continue;
         }
 
-        var template = cmpTechnologyManager.GetTechnologyTemplate(tech);
+        var template = cmpTechnologyManager.GetTemplate(tech);
         if (template.top)
             ret[i] = {"pair": true, "top": template.top, "bottom": template.bottom};
         else
@@ -223 +223 @@
     
     var cmpTechnologyManager = QueryOwnerInterface(this.entity, IID_TechnologyManager);
     
-    var template = cmpTechnologyManager.GetTechnologyTemplate(tech);
+    var template = cmpTechnologyManager.GetTemplate(tech);
     if (template.top)
     {
         return (cmpTechnologyManager.IsTechnologyResearched(template.top) || cmpTechnologyManager.IsInProgress(template.top)
@@ -316 +316 @@
         else if (type == "technology")
         {
             // Load the technology template
-            var cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
-            var template = cmpTechnologyTemplateManager.GetTemplate(templateName);
+            var cmpJsonTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_JsonTemplateManager);
+            var template = cmpJsonTemplateManager.GetTechnologyTemplate(templateName);
             if (!template)
                 return;
             var cmpPlayer = QueryOwnerInterface(this.entity);
@@ -760 +760 @@
             var cmpTechnologyManager = QueryOwnerInterface(this.entity, IID_TechnologyManager);
             cmpTechnologyManager.ResearchTechnology(item.technologyTemplate);
             
-            var template = cmpTechnologyManager.GetTechnologyTemplate(item.technologyTemplate);
+            var template = cmpTechnologyManager.GetTemplate(item.technologyTemplate);
             
             if (template && template.soundComplete)
             {

binaries/data/mods/public/simulation/components/TechnologyManager.js

@@ -41 +41 @@
     // Some technologies are automatically researched when their conditions are met.  They have no cost and are 
     // researched instantly.  This allows civ bonuses and more complicated technologies.
     this.autoResearchTech = {};
-    var allTechs = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager).GetAllTechs();
+    var allTechs = Engine.QueryInterface(SYSTEM_ENTITY, IID_JsonTemplateManager).GetAllTechs();
     for (var key in allTechs)
     {
         if (allTechs[key].autoResearch || allTechs[key].top)
@@ -58 +58 @@
 // This function checks if the requirements of any autoresearch techs are met and if they are it researches them
 TechnologyManager.prototype.UpdateAutoResearch = function()
 {
-    var cmpTechTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
+    var cmpJsonTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_JsonTemplateManager);
     for (var key in this.autoResearchTech)
     {
-        var tech = cmpTechTempMan.GetTemplate(key);
+        var tech = cmpJsonTempMan.GetTechnologyTemplate(key);
         if ((tech.autoResearch && this.CanResearch(key))
             || (tech.top && (this.IsTechnologyResearched(tech.top) || this.IsTechnologyResearched(tech.bottom))))
         {
@@ -72 +72 @@
     }
 };
 
-TechnologyManager.prototype.GetTechnologyTemplate = function(tech)
+TechnologyManager.prototype.GetTemplate = function(tech)
 {
-    return Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager).GetTemplate(tech);
+    return Engine.QueryInterface(SYSTEM_ENTITY, IID_JsonTemplateManager).GetTechnologyTemplate(tech);
 };
 
 // Checks an entity template to see if its technology requirements have been met
@@ -97 +97 @@
 // Checks the requirements for a technology to see if it can be researched at the current time
 TechnologyManager.prototype.CanResearch = function(tech)
 {
-    var template = this.GetTechnologyTemplate(tech);
+    var template = this.GetTemplate(tech);
     if (!template)
     {
         warn("Technology \"" + tech + "\" does not exist");
@@ -254 +254 @@
 {
     this.StoppedResearch(tech); // The tech is no longer being currently researched
 
-    var template = this.GetTechnologyTemplate(tech);
+    var template = this.GetTemplate(tech);
 
     if (!template)
     {
@@ -319 +319 @@
             if (!i || this.IsTechnologyResearched(i))
                 continue;
 
-            var template = this.GetTechnologyTemplate(i);
+            var template = this.GetTemplate(i);
             this.researchedTechs[i] = template;
 
             // Change the EntityLimit if any

binaries/data/mods/public/simulation/components/TechnologyTemplateManager.js

@@ -1 @@
-/**
- * System component which loads the technology and the aura data files
- */
-function TechnologyTemplateManager() {}
-
-TechnologyTemplateManager.prototype.Schema =
-    "<a:component type='system'/><empty/>";
-
-TechnologyTemplateManager.prototype.Init = function()
-{
-    this.allTechs = {};
-    this.allAuras = {};
-    var techNames = this.ListAllTechs();
-    for (var i in techNames)
-        this.GetTemplate(techNames[i]);
-};
-
-TechnologyTemplateManager.prototype.GetTemplate = function(template)
-{
-    if (!this.allTechs[template])
-    {
-        this.allTechs[template] = Engine.ReadJSONFile("technologies/" + template + ".json");
-        if (!this.allTechs[template])
-            error("Failed to load technology \"" + template + "\"");
-    }
-
-    return this.allTechs[template];
-};
-
-TechnologyTemplateManager.prototype.GetAuraTemplate = function(template)
-{
-    if (!this.allAuras[template])
-    {
-        this.allAuras[template] = Engine.ReadJSONFile("auras/" + template + ".json");
-        if (!this.allAuras[template])
-            error("Failed to load aura \"" + template + "\"");
-    }
-
-    return this.allAuras[template];
-};
-
-TechnologyTemplateManager.prototype.ListAllTechs = function()
-{
-    return Engine.FindJSONFiles("technologies", true);
-};
-
-TechnologyTemplateManager.prototype.GetAllTechs = function()
-{
-    return this.allTechs;
-};
-
-Engine.RegisterSystemComponentType(IID_TechnologyTemplateManager, "TechnologyTemplateManager", TechnologyTemplateManager);

binaries/data/mods/public/simulation/components/tests/test_Auras.js

@@ -25 +25 @@
     GetEntityFlagMask: function(identifier) { },
 });
 
-AddMock(SYSTEM_ENTITY, IID_TechnologyTemplateManager, {
+AddMock(SYSTEM_ENTITY, IID_JsonTemplateManager, {
     GetAuraTemplate: function(name) {
         if (name == "test1")
             return {

binaries/data/mods/public/simulation/helpers/Cheat.js

@@ -90 +90 @@
             return;
 
         // check if specialised tech exists (like phase_town_athen)
-        var cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
-        if (cmpTechnologyTemplateManager.ListAllTechs().indexOf(parameter + "_" + cmpPlayer.civ) > -1)
+        var cmpJsonTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_JsonTemplateManager);
+        if (cmpJsonTemplateManager.ListAllTechs().indexOf(parameter + "_" + cmpPlayer.civ) > -1)
             parameter += "_" + cmpPlayer.civ;
 
         Cheat({ "player": input.player, "action": "researchTechnology", "parameter": parameter, "selected": input.selected });

source/simulation2/TypeList.h

@@ -160 +160 @@
 INTERFACE(ValueModificationManager)
 COMPONENT(ValueModificationManagerScripted)
 
-INTERFACE(TechnologyTemplateManager)
-COMPONENT(TechnologyTemplateManagerScripted)
+INTERFACE(JsonTemplateManager)
+COMPONENT(JsonTemplateManagerScripted)
 
 INTERFACE(Terrain)
 COMPONENT(Terrain)

source/simulation2/components/CCmpAIManager.cpp

@@ -34 +34 @@
 #include "simulation2/components/ICmpObstructionManager.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpTemplateManager.h"
-#include "simulation2/components/ICmpTechnologyTemplateManager.h"
+#include "simulation2/components/ICmpJsonTemplateManager.h"
 #include "simulation2/components/ICmpTerritoryManager.h"
 #include "simulation2/helpers/LongPathfinder.h"
 #include "simulation2/serialization/DebugSerializer.h"
@@ -979 +979 @@
         JSAutoRequest rq(cx);
 
         // load the technology templates
-        CmpPtr<ICmpTechnologyTemplateManager> cmpTechTemplateManager(GetSystemEntity());
-        ENSURE(cmpTechTemplateManager);
+        CmpPtr<ICmpJsonTemplateManager> cmpJsonTemplateManager(GetSystemEntity());
+        ENSURE(cmpJsonTemplateManager);
 
         // Get the game state from AIInterface
         JS::RootedValue techTemplates(cx);
-        cmpTechTemplateManager->GetAllTechs(&techTemplates);
+        cmpJsonTemplateManager->GetAllTechs(&techTemplates);
 
         m_Worker.RegisterTechTemplates(scriptInterface.WriteStructuredClone(techTemplates));
         m_Worker.TryLoadSharedComponent(true);

source/simulation2/components/ICmpJsonTemplateManager.cpp

@@ -17 +17 @@
 
 #include "precompiled.h"
 
-#include "ICmpTechnologyTemplateManager.h"
+#include "ICmpJsonTemplateManager.h"
 
 #include "simulation2/system/InterfaceScripted.h"
 #include "simulation2/scripting/ScriptComponent.h"
 
-BEGIN_INTERFACE_WRAPPER(TechnologyTemplateManager)
-END_INTERFACE_WRAPPER(TechnologyTemplateManager)
+BEGIN_INTERFACE_WRAPPER(JsonTemplateManager)
+END_INTERFACE_WRAPPER(JsonTemplateManager)
 
-class CCmpTechnologyTemplateManagerScripted : public ICmpTechnologyTemplateManager
+class CCmpJsonTemplateManagerScripted : public ICmpJsonTemplateManager
 {
 public:
-    DEFAULT_SCRIPT_WRAPPER(TechnologyTemplateManagerScripted)
+    DEFAULT_SCRIPT_WRAPPER(JsonTemplateManagerScripted)
 
     virtual void GetAllTechs(JS::MutableHandleValue ret)
     {
@@ -36 +36 @@
     }
 };
 
-REGISTER_COMPONENT_SCRIPT_WRAPPER(TechnologyTemplateManagerScripted)
+REGISTER_COMPONENT_SCRIPT_WRAPPER(JsonTemplateManagerScripted)

source/simulation2/components/ICmpJsonTemplateManager.h

@@ -15 +15 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef INCLUDED_ICMPTECHNOLOGYTEMPLATEMANAGER
-#define INCLUDED_ICMPTECHNOLOGYTEMPLATEMANAGER
+#ifndef INCLUDED_ICMPJSONTEMPLATEMANAGER
+#define INCLUDED_ICMPJSONTEMPLATEMANAGER
 
 #include "simulation2/system/Interface.h"
 
@@ -23 +23 @@
 #include "maths/Fixed.h"
 
 /**
- * Technology template manager interface.
+ * Json template manager interface.
  * (This interface only includes the functions needed by native code for accessing
- *  technology template data, the associated logic is handled in scripts)
+ *  json template data, the associated logic is handled in scripts)
  */
-class ICmpTechnologyTemplateManager : public IComponent
+class ICmpJsonTemplateManager : public IComponent
 {
 public:
     virtual void GetAllTechs(JS::MutableHandleValue ret) = 0;
 
-    DECLARE_INTERFACE_TYPE(TechnologyTemplateManager)
+    DECLARE_INTERFACE_TYPE(JsonTemplateManager)
 };
 
-#endif // INCLUDED_ICMPTECHNOLOGYTEMPLATEMANAGER
+#endif // INCLUDED_ICMPJSONTEMPLATEMANAGER

source/simulation2/components/ICmpTechnologyTemplateManager.cpp

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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 2 of the License, or
- * (at your option) any later version.
- *
- * 0 A.D. 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 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "precompiled.h"
-
-#include "ICmpTechnologyTemplateManager.h"
-
-#include "simulation2/system/InterfaceScripted.h"
-#include "simulation2/scripting/ScriptComponent.h"
-
-BEGIN_INTERFACE_WRAPPER(TechnologyTemplateManager)
-END_INTERFACE_WRAPPER(TechnologyTemplateManager)
-
-class CCmpTechnologyTemplateManagerScripted : public ICmpTechnologyTemplateManager
-{
-public:
-    DEFAULT_SCRIPT_WRAPPER(TechnologyTemplateManagerScripted)
-
-    virtual void GetAllTechs(JS::MutableHandleValue ret)
-    {
-        return m_Script.CallRef("GetAllTechs", ret);
-    }
-};
-
-REGISTER_COMPONENT_SCRIPT_WRAPPER(TechnologyTemplateManagerScripted)

source/simulation2/components/ICmpTechnologyTemplateManager.h

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. 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 2 of the License, or
- * (at your option) any later version.
- *
- * 0 A.D. 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 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_ICMPTECHNOLOGYTEMPLATEMANAGER
-#define INCLUDED_ICMPTECHNOLOGYTEMPLATEMANAGER
-
-#include "simulation2/system/Interface.h"
-
-#include "maths/Fixed.h"
-
-/**
- * Technology template manager interface.
- * (This interface only includes the functions needed by native code for accessing
- *  technology template data, the associated logic is handled in scripts)
- */
-class ICmpTechnologyTemplateManager : public IComponent
-{
-public:
-    virtual void GetAllTechs(JS::MutableHandleValue ret) = 0;
-
-    DECLARE_INTERFACE_TYPE(TechnologyTemplateManager)
-};
-
-#endif // INCLUDED_ICMPTECHNOLOGYTEMPLATEMANAGER