Update dependencies for 1.0

Author: FilUnderscore

000-ModManager/Config/XUi_Menu/windows.xml

@@ -155,7 +155,7 @@
 		</window>
 	</append>
 
-	<setattribute xpath="/windows/window[@name='loadingScreen']/label[@name='lblText']" name="anchor_bottom">#cam,0,40</setattribute>
+	<setattribute xpath="/windows/window[@name='loadingScreen']/rect[@name='tips_enabled']/label[@name='lblText']" name="anchor_bottom">#cam,0,40</setattribute>
 
 	<append xpath="/windows/window[@name='loadingScreen']">
 		<label name="lblTextMods" depth="6" anchor_left="#cam,0,20"   anchor_right="#cam,1,-20"   anchor_bottom="#cam,0,10"  anchor_top="#cam,0,40" font_size="24" justify="left" spacing_y="5" text="{modlisttext}" />

Source/Mod/Mod.cs

@@ -106,7 +106,7 @@ public bool Load()
 
             if (this.instance == null)
             {
-                this.instance = global::Mod.LoadFromFolder(this.Info.Path);
+                this.instance = global::Mod.LoadDefinitionFromFolder(this.Info.Path);
                 ThreadManager.RunCoroutineSync(ModManager.LoadPatchStuff(false));
             }
 

Source/Mod/ModListCompatChecker.cs

@@ -168,7 +168,7 @@ private static void SaveModList()
 
             [HarmonyPatch(typeof(XUiC_SavegamesList.ListEntry))]
             [HarmonyPatch(MethodType.Constructor)]
-            [HarmonyPatch(new Type[] { typeof(string), typeof(string), typeof(DateTime), typeof(WorldState) })]
+            [HarmonyPatch(new Type[] { typeof(string), typeof(string), typeof(DateTime), typeof(WorldState), typeof(string), typeof(string), typeof(string) })]
             class XUiC_SavegamesListListEntryHook
             {
                 static void Postfix(XUiC_SavegamesList.ListEntry __instance)

Source/ModManager.csproj

@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony">
-      <HintPath>..\Dependencies\7DaysToDieServer_Data\Managed\0Harmony.dll</HintPath>
+      <HintPath>..\Dependencies\Mods\0_TFP_Harmony\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
@@ -44,6 +44,10 @@
       <HintPath>..\Dependencies\7DaysToDieServer_Data\Managed\LogLibrary.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="NGUI">
+      <HintPath>..\Dependencies\7DaysToDieServer_Data\Managed\NGUI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

Source/UI/XUiC_ModSettingSelector.cs

@@ -74,7 +74,7 @@ public void UpdateModSetting(ModManagerModSettings.BaseModSetting modSetting)
                     this.textLabel.IsVisible = true;
                     this.label.IsVisible = false;
                     this.button.ViewComponent.IsVisible = true;
-                    this.button.Label = (this.modSetting as ModManagerModSettings.ButtonModSetting).GetButtonText();
+                    this.button.Text = (this.modSetting as ModManagerModSettings.ButtonModSetting).GetButtonText();
                     this.button.Enabled = IsEnabled();
 
                     return;

Source/UI/XUiC_ModsListModSettings.cs

@@ -123,15 +123,15 @@ private void UpdateTabs()
                     var tabEntry = ModManagerModSettings.modSettingsInstances[this.mod].settingTabs.ElementAt(index);
                     ModManagerModSettings.ModSettingTab tab = tabEntry.Value;
 
-                    settingsTabs.GetTabButton(tabIndex).Label = Localization.Get(tab.nameUnlocalized);
+                    settingsTabs.GetTabButton(tabIndex).Text = Localization.Get(tab.nameUnlocalized);
                     settingsTabs.GetTabButton(tabIndex).ViewComponent.IsVisible = true;
 
                     tabIndex++;
                 }
 
                 while(tabIndex < settingsTabs.TabCount)
                 {
-                    settingsTabs.GetTabButton(tabIndex).Label = "";
+                    settingsTabs.GetTabButton(tabIndex).Text = "";
                     settingsTabs.GetTabButton(tabIndex).ViewComponent.IsVisible = true;
                     settingsTabs.GetTabButton(tabIndex).Enabled = false;
 

setup-dev-linux.sh

@@ -7,7 +7,7 @@ echo "Extracting DepotDownloader"
 unzip "DepotDownloader-linux-x64.zip"
 echo "Downloading Latest Binaries"
 sudo chmod 777 ./DepotDownloader
-sudo ./DepotDownloader -app 294420 -filelist "../setup-filelist.txt" -dir "../Dependencies"
+sudo ./DepotDownloader -app 294420 -beta ${1:-Public} -filelist "../setup-filelist.txt" -dir "../Dependencies"
 echo "Dependencies successfully downloaded"
 echo "Cleaning up"
 cd "../"

setup-dev-win.bat

@@ -1,4 +1,5 @@
 @ECHO off
+IF "%~1"=="" (SET branch=Public) ELSE (SET branch=%1)
 ECHO Setting up dependencies
 ECHO Downloading DepotDownloader
 mkdir "temp"
@@ -7,7 +8,7 @@ curl -JL "https://github.com/SteamRE/DepotDownloader/releases/latest/download/De
 ECHO Extracting DepotDownloader
 tar -xf "DepotDownloader-windows-x64.zip"
 ECHO Downloading Latest Binaries
-DepotDownloader.exe -app 294420 -filelist ../setup-filelist.txt -dir ../Dependencies
+DepotDownloader.exe -app 294420 -beta %branch% -filelist ../setup-filelist.txt -dir ../Dependencies
 ECHO Dependencies successfully downloaded
 ECHO Cleaning up
 cd ../

setup-filelist.txt

@@ -1 +1,2 @@
-regex:7DaysToDieServer_Data\/Managed\/(.*)dll
+regex:7DaysToDieServer_Data\/Managed\/(.*)dll
+regex:Mods\/0_TFP_Harmony\/(.*)dll