Upgraded whole codebase and unpinned LDC version

CromFr · Oct 31, 2023 · b88079c · b88079c
1 parent 5cc3713
commit b88079c
Show file tree

Hide file tree

Showing 15 changed files with 128 additions and 119 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,10 +21,10 @@ jobs:
 
           echo "========= Install latest LDC ========="
           wget -q https://dlang.org/install.sh -O /tmp/install.sh
-          bash /tmp/install.sh install ldc-1.24.0                                 # PIN LDC VERSION because of https://github.com/mysql-d/mysql-native/issues/224
+          bash /tmp/install.sh install ldc
 
           echo "========= Create LDC activation symlink ========="
-          ln -s "$(bash /tmp/install.sh install ldc-1.24.0 -a)" ~/dlang/activate  # PIN LDC VERSION because of https://github.com/mysql-d/mysql-native/issues/224
+          ln -s "$(bash /tmp/install.sh install ldc -a)" ~/dlang/activate
           source ~/dlang/activate
 
           echo "========= Install LDC windows libs for cross compiling ========="

diff --git a/adjust-item-prices/dub.sdl b/adjust-item-prices/dub.sdl
@@ -3,7 +3,7 @@ description "Set additional cost to reach a certain gold value"
 authors "Crom"
 copyright "Copyright © 2020, Crom"
 license "GPLv3"
-dependency "nwn-lib-d" version="~>1.0.0"
+dependency "nwn-lib-d" version="~>1.1.0"
 
 sourcePaths "source"
-stringImportPaths "res"
+stringImportPaths "res"
diff --git a/adjust-item-prices/dub.selections.json b/adjust-item-prices/dub.selections.json
@@ -1,7 +1,8 @@
 {
 	"fileVersion": 1,
 	"versions": {
-		"gfm": "7.0.8",
-		"nwn-lib-d": "1.0.0"
+		"gfm": "8.0.6",
+		"intel-intrinsics": "1.11.15",
+		"nwn-lib-d": "1.1.0"
 	}
 }
diff --git a/bictoutc/dub.sdl b/bictoutc/dub.sdl
@@ -4,6 +4,6 @@ license "GPL-3.0"
 copyright "Copyright © 2016, Thibaut CHARLES"
 authors "Thibaut CHARLES"
 
-dependency "nwn-lib-d" version="*"
+dependency "nwn-lib-d" version="~>1.1.0"
 
 sourcePaths "source"
diff --git a/bictoutc/dub.selections.json b/bictoutc/dub.selections.json
@@ -1,7 +1,8 @@
 {
 	"fileVersion": 1,
 	"versions": {
-		"gfm": "7.0.8",
-		"nwn-lib-d": "0.0.4+commit.38.g5f823f2"
+		"gfm": "8.0.6",
+		"intel-intrinsics": "1.11.15",
+		"nwn-lib-d": "1.1.0"
 	}
 }
diff --git a/bictoutc/source/app.d b/bictoutc/source/app.d
@@ -53,50 +53,50 @@ int main(string[] args)
 
 	if(rmEquip){
 		// Remove equipped items
-		gff["Equip_ItemList"].as!(GffType.List).length = 0;
+		gff["Equip_ItemList"].get!GffList.length = 0;
 	}
 	else{
 		//Set item list resrefs
-		foreach(ref item ; gff["Equip_ItemList"].as!(GffType.List)){
+		foreach(ref item ; gff["Equip_ItemList"].get!GffList){
 
-			auto newItem = GffNode(GffType.Struct);
-			newItem.structType = item.structType;
-			newItem["Repos_PosX"] = GffNode(GffType.Word, null, 0);
-			newItem["Repos_PosY"] = GffNode(GffType.Word, null, 0);
-			newItem["Pickpocketable"] = GffNode(GffType.Byte, null, 0);
-			newItem["Dropable"] = GffNode(GffType.Byte, null, 0);
-			newItem["EquippedRes"] = GffNode(GffType.ResRef, null, item["TemplateResRef"].to!string);
+			auto newItem = GffStruct();
+			newItem.id = item.id;
+			newItem["Repos_PosX"] = GffWord(0);
+			newItem["Repos_PosY"] = GffWord(0);
+			newItem["Pickpocketable"] = GffByte(0);
+			newItem["Dropable"] = GffByte(0);
+			newItem["EquippedRes"] = GffResRef(item["TemplateResRef"].to!string);
 
 			item = newItem;
 		}
 	}
 
 	if(keepInv){
 		//Set item list resrefs
-		foreach(ref item ; gff["ItemList"].as!(GffType.List)){
+		foreach(ref item ; gff["ItemList"].get!GffList){
 
-			auto newItem = GffNode(GffType.Struct);
-			newItem.structType = item.structType;
-			newItem["Repos_PosX"] = GffNode(GffType.Word, null, 0);
-			newItem["Repos_PosY"] = GffNode(GffType.Word, null, 0);
-			newItem["Pickpocketable"] = GffNode(GffType.Byte, null, 0);
-			newItem["Dropable"] = GffNode(GffType.Byte, null, 0);
-			newItem["EquippedRes"] = GffNode(GffType.ResRef, null, item["TemplateResRef"].to!string);
+			auto newItem = GffStruct();
+			newItem.id = item.id;
+			newItem["Repos_PosX"] = GffWord(0);
+			newItem["Repos_PosY"] = GffWord(0);
+			newItem["Pickpocketable"] = GffByte(0);
+			newItem["Dropable"] = GffByte(0);
+			newItem["EquippedRes"] = GffResRef(item["TemplateResRef"].to!string);
 
 			item = newItem;
 		}
 	}
 	else{
 		//Remove inventory items
-		gff["ItemList"].as!(GffType.List).length = 0;
+		gff["ItemList"].get!GffList.length = 0;
 	}
 
 	//Set misc
-	gff["TemplateResRef"].as!(GffType.ResRef) = resref;
-	gff["Tag"].as!(GffType.ExoString) = resref;
-	gff["FactionID"].as!(GffType.Word) = factionId;
-	gff["Classification"] = GffNode(GffType.ExoString, null, classification);
-	gff["IsPC"].as!(GffType.Byte) = 0;
+	gff["TemplateResRef"].get!GffResRef = resref;
+	gff["Tag"].get!GffString = resref;
+	gff["FactionID"].get!GffWord = factionId;
+	gff["Classification"] = classification;
+	gff["IsPC"].get!GffByte = 0;
 
 	foreach(key ; [
 		"LvlStatList",
@@ -163,24 +163,24 @@ int main(string[] args)
 		"CreatnScrptFird",
 		]){
 		if(key in gff)
-			gff.as!(GffType.Struct).remove(key);
+			gff.root.remove(key);
 	}
 
 
 	//Set scripts
-	gff["ScriptAttacked"].as!(GffType.ResRef) = scriptsOverride.get("Attacked", "nw_c2_default5");
-	gff["ScriptDamaged"].as!(GffType.ResRef) = scriptsOverride.get("Damaged", "nw_c2_default6");
-	gff["ScriptDeath"].as!(GffType.ResRef) = scriptsOverride.get("Death", "nw_c2_default7");
-	gff["ScriptDialogue"].as!(GffType.ResRef) = scriptsOverride.get("Dialogue", "nw_c2_default4");
-	gff["ScriptDisturbed"].as!(GffType.ResRef) = scriptsOverride.get("Disturbed", "nw_c2_default8");
-	gff["ScriptEndRound"].as!(GffType.ResRef) = scriptsOverride.get("EndRound", "nw_c2_default3");
-	gff["ScriptHeartbeat"].as!(GffType.ResRef) = scriptsOverride.get("Heartbeat", "nw_c2_default1");
-	gff["ScriptOnBlocked"].as!(GffType.ResRef) = scriptsOverride.get("OnBlocked", "nw_c2_defaulte");
-	gff["ScriptOnNotice"].as!(GffType.ResRef) = scriptsOverride.get("OnNotice", "nw_c2_default2");
-	gff["ScriptRested"].as!(GffType.ResRef) = scriptsOverride.get("Rested", "nw_c2_defaulta");
-	gff["ScriptSpawn"].as!(GffType.ResRef) = scriptsOverride.get("Spawn", "nw_c2_default9");
-	gff["ScriptSpellAt"].as!(GffType.ResRef) = scriptsOverride.get("SpellAt", "nw_c2_defaultb");
-	gff["ScriptUserDefine"].as!(GffType.ResRef) = scriptsOverride.get("UserDefine", "nw_c2_defaultd");
+	gff["ScriptAttacked"].get!GffResRef = scriptsOverride.get("Attacked", "nw_c2_default5");
+	gff["ScriptDamaged"].get!GffResRef = scriptsOverride.get("Damaged", "nw_c2_default6");
+	gff["ScriptDeath"].get!GffResRef = scriptsOverride.get("Death", "nw_c2_default7");
+	gff["ScriptDialogue"].get!GffResRef = scriptsOverride.get("Dialogue", "nw_c2_default4");
+	gff["ScriptDisturbed"].get!GffResRef = scriptsOverride.get("Disturbed", "nw_c2_default8");
+	gff["ScriptEndRound"].get!GffResRef = scriptsOverride.get("EndRound", "nw_c2_default3");
+	gff["ScriptHeartbeat"].get!GffResRef = scriptsOverride.get("Heartbeat", "nw_c2_default1");
+	gff["ScriptOnBlocked"].get!GffResRef = scriptsOverride.get("OnBlocked", "nw_c2_defaulte");
+	gff["ScriptOnNotice"].get!GffResRef = scriptsOverride.get("OnNotice", "nw_c2_default2");
+	gff["ScriptRested"].get!GffResRef = scriptsOverride.get("Rested", "nw_c2_defaulta");
+	gff["ScriptSpawn"].get!GffResRef = scriptsOverride.get("Spawn", "nw_c2_default9");
+	gff["ScriptSpellAt"].get!GffResRef = scriptsOverride.get("SpellAt", "nw_c2_defaultb");
+	gff["ScriptUserDefine"].get!GffResRef = scriptsOverride.get("UserDefine", "nw_c2_defaultd");
 
 
 

diff --git a/camtosql/dub.sdl b/camtosql/dub.sdl
@@ -4,7 +4,7 @@ authors "Thibaut CHARLES"
 copyright "Copyright © 2020, Thibaut CHARLES"
 license "GPL-3.0"
 
-dependency "nwn-lib-d" version="==0.0.7"
+dependency "nwn-lib-d" version="~>1.1.0"
 dependency "colorize" version="~>1.0.5"
 dependency "mysql-native" version="~>3.0.0"
 

diff --git a/camtosql/dub.selections.json b/camtosql/dub.selections.json
@@ -2,15 +2,17 @@
 	"fileVersion": 1,
 	"versions": {
 		"colorize": "1.0.5",
-		"eventcore": "0.9.13",
-		"gfm": "7.0.8",
+		"eventcore": "0.9.26",
+		"gfm": "8.0.6",
+		"intel-intrinsics": "1.11.15",
 		"libasync": "0.8.6",
-		"memutils": "1.0.4",
-		"mysql-native": "3.0.1",
-		"nwn-lib-d": "0.0.7",
+		"memutils": "1.0.9",
+		"mysql-native": "3.0.3",
+		"nwn-lib-d": "1.1.0",
 		"stdx-allocator": "2.77.5",
-		"taggedalgebraic": "0.11.21",
+		"taggedalgebraic": "0.11.22",
 		"unit-threaded": "0.7.55",
-		"vibe-core": "1.16.0"
+		"vibe-container": "1.0.0",
+		"vibe-core": "2.4.0"
 	}
 }
diff --git a/camtosql/source/app.d b/camtosql/source/app.d
@@ -82,7 +82,7 @@ int main(string[] args){
 		enforce((sqlTablePrefix is null) ^ (sqlSingleTable is null), "You cannot use both --sql-table-prefix and --sql-table-name");
 
 		camFiles = args[1 .. $];
-		camFiles.each!(a => {
+		camFiles.each!((a) {
 			enforce(a.extension.toLower == ".dbf", "File " ~ a ~ " is not a .dbf file");
 			enforce(a.exists, "File " ~ a ~ " does not exist");
 		});
@@ -409,4 +409,4 @@ string buildPathCI(T...)(in string basePath, T subFiles){
 		}
 	}
 	return path;
-}
+}
diff --git a/itemupdater/dub.sdl b/itemupdater/dub.sdl
@@ -4,5 +4,5 @@ license "GPL-3.0"
 copyright "Copyright © 2016, Thibaut CHARLES"
 authors "Thibaut CHARLES"
 
-dependency "nwn-lib-d" version="==0.0.7"
+dependency "nwn-lib-d" version="~>1.1.0"
 dependency "mysql-native" version="~>3.0.0"
diff --git a/itemupdater/dub.selections.json b/itemupdater/dub.selections.json
@@ -1,18 +1,20 @@
 {
 	"fileVersion": 1,
 	"versions": {
-		"eventcore": "0.9.13",
-		"gfm": "7.0.8",
+		"eventcore": "0.9.26",
+		"gfm": "8.0.6",
 		"gl3n": "1.3.1",
+		"intel-intrinsics": "1.11.15",
 		"libasync": "0.8.6",
 		"libevent": "2.0.2+2.0.16",
-		"memutils": "1.0.4",
-		"mysql-native": "3.0.0",
-		"nwn-lib-d": "0.0.7",
+		"memutils": "1.0.9",
+		"mysql-native": "3.0.3",
+		"nwn-lib-d": "1.1.0",
 		"stdx-allocator": "2.77.5",
-		"taggedalgebraic": "0.11.19",
+		"taggedalgebraic": "0.11.22",
 		"unit-threaded": "0.7.55",
-		"vibe-core": "1.13.0",
+		"vibe-container": "1.0.0",
+		"vibe-core": "2.4.0",
 		"vibe-d": "0.8.4"
 	}
 }