Auga 1.3.0

Auga/API.Common.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using TMPro;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace Auga
@@ -13,15 +14,15 @@ public enum RequirementWireState
     public class PlayerPanelTabData
     {
         public int Index;
-        public Text TabTitle;
+        public TMP_Text TabTitle;
         public GameObject TabButtonGO;
         public GameObject ContentGO;
     }
 
     public class WorkbenchTabData
     {
         public int Index;
-        public Text TabTitle;
+        public TMP_Text TabTitle;
         public GameObject TabButtonGO;
         public GameObject RequirementsPanelGO;
         public GameObject ItemInfoGO;

Auga/API.External.cs

@@ -5,6 +5,7 @@
 using System.Reflection.Emit;
 using HarmonyLib;
 using JetBrains.Annotations;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -141,7 +142,7 @@ public static void ComplexTooltip_SetSkill(GameObject complexTooltipGO, Skills.S
         public static GameObject[] RequirementsPanel_RequirementList(GameObject requirementsPanelGO) => null;
         public static void RequirementsPanel_SetWires(GameObject requirementsPanelGO, RequirementWireState[] wireStates, bool canCraft) { }
 
-        public static Text CustomVariantPanel_Enable(string buttonLabel, Action<bool> onShow) => null;
+        public static TMP_Text CustomVariantPanel_Enable(string buttonLabel, Action<bool> onShow) => null;
         public static void CustomVariantPanel_SetButtonLabel(string buttonLabel) { }
         public static void CustomVariantPanel_Disable() { }
     }

Auga/API.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using AugaUnity;
 using JetBrains.Annotations;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 using Object = UnityEngine.Object;
@@ -65,7 +66,7 @@ public static Button SmallButton_Create(Transform parent, string name, string la
         {
             var button = Object.Instantiate(Auga.Assets.ButtonSmall, parent);
             button.name = name;
-            var text = button.GetComponentInChildren<Text>();
+            var text = button.GetComponentInChildren<TMP_Text>();
             if (text != null)
             {
                 text.text = Localization.instance.Localize(labelText);
@@ -79,7 +80,7 @@ public static Button MediumButton_Create(Transform parent, string name, string l
         {
             var button = Object.Instantiate(Auga.Assets.ButtonMedium, parent);
             button.name = name;
-            var text = button.GetComponentInChildren<Text>();
+            var text = button.GetComponentInChildren<TMP_Text>();
             if (text != null)
             {
                 text.text = Localization.instance.Localize(labelText);
@@ -93,7 +94,7 @@ public static Button FancyButton_Create(Transform parent, string name, string la
         {
             var button = Object.Instantiate(Auga.Assets.ButtonFancy, parent);
             button.name = name;
-            var text = button.GetComponentInChildren<Text>();
+            var text = button.GetComponentInChildren<TMP_Text>();
             if (text != null)
             {
                 text.text = Localization.instance.Localize(labelText);
@@ -107,7 +108,7 @@ public static Button SettingsButton_Create(Transform parent, string name, string
         {
             var button = Object.Instantiate(Auga.Assets.ButtonSettings, parent);
             button.name = name;
-            var text = button.GetComponentInChildren<Text>();
+            var text = button.GetComponentInChildren<TMP_Text>();
             if (text != null)
             {
                 text.text = Localization.instance.Localize(labelText);
@@ -187,7 +188,7 @@ public static void Button_SetTextColors(Button button, Color normal, Color highl
                 colorValues.TextColors.disabledColor = disabled;
             }
 
-            var text = button.GetComponentInChildren<Text>();
+            var text = button.GetComponentInChildren<TMP_Text>();
             if (text != null)
             {
                 text.color = baseTextColor;
@@ -203,7 +204,7 @@ public static void Button_OverrideTextColor(Button button, Color color)
                 Object.Destroy(colorValues);
             }
 
-            var text = button.GetComponentInChildren<Text>();
+            var text = button.GetComponentInChildren<TMP_Text>();
             if (text != null)
             {
                 text.color = color;
@@ -799,7 +800,7 @@ public static void RequirementsPanel_SetWires(GameObject requirementsPanelGO, Re
         // Custom Variant Panel
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         [UsedImplicitly]
-        public static Text CustomVariantPanel_Enable(string buttonLabel, Action<bool> onShow)
+        public static TMP_Text CustomVariantPanel_Enable(string buttonLabel, Action<bool> onShow)
         {
             if (WorkbenchPanelController.instance == null)
             {

Auga/Auga.cs

@@ -30,6 +30,7 @@ public class AugaAssets
         public GameObject SettingsPrefab;
         public GameObject MessageHud;
         public GameObject TextInput;
+        public GameObject AugaBarber;
         public GameObject AugaChat;
         public GameObject DamageText;
         public GameObject EnemyHud;
@@ -77,11 +78,13 @@ public class AugaColors
     [BepInPlugin(PluginID, "Project Auga", Version)]
     [BepInDependency("Menthus.bepinex.plugins.BetterTrader", BepInDependency.DependencyFlags.SoftDependency)]
     [BepInDependency("maximods.valheim.multicraft", BepInDependency.DependencyFlags.SoftDependency)]
+    [BepInDependency("redseiko.valheim.chatter", BepInDependency.DependencyFlags.SoftDependency)]
+    [BepInDependency("redseiko.valheim.searscatalog", BepInDependency.DependencyFlags.SoftDependency)]
     [BepInDependency("com.github.abearcodes.valheim.simplerecycling", BepInDependency.DependencyFlags.SoftDependency)]
     public class Auga : BaseUnityPlugin
     {
         public const string PluginID = "randyknapp.mods.auga";
-        public const string Version = "1.2.15";
+        public const string Version = "1.3.4";
 
         public enum StatBarTextDisplayMode { JustValue, ValueAndMax, ValueMaxPercent, JustPercent }
         public enum StatBarTextPosition { Off = -1, Above, Below, Center, Start, End };
@@ -157,8 +160,7 @@ public void Awake()
                     }
                 }
             }
-
-
+
             LoadDependencies();
             LoadTranslations();
             LoadConfig();
@@ -374,6 +376,7 @@ private static void LoadAssets()
             Assets.SettingsPrefab = assetBundle.LoadAsset<GameObject>("AugaSettings");
             Assets.MessageHud = assetBundle.LoadAsset<GameObject>("AugaMessageHud");
             Assets.TextInput = assetBundle.LoadAsset<GameObject>("AugaTextInput");
+            Assets.AugaBarber = assetBundle.LoadAsset<GameObject>("AugaBarber");
             Assets.AugaChat = assetBundle.LoadAsset<GameObject>("AugaChat");
             Assets.DamageText = assetBundle.LoadAsset<GameObject>("AugaDamageText");
             Assets.EnemyHud = assetBundle.LoadAsset<GameObject>("AugaEnemyHud");

Auga/Auga.csproj

@@ -130,6 +130,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'API|AnyCPU' ">
     <Compile Include="API.External.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)|$(Platform)' != 'API|AnyCPU' ">
     <Compile Include="API.cs" />
@@ -186,6 +187,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="API.Common.cs" />
+    <Compile Include="Barber_Setup.cs" />
+    <Compile Include="SkillsDialog_Patch.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\CHANGELOG.md">
@@ -200,7 +203,7 @@
 )
 
 if $(ConfigurationName) == API (
-  xcopy "$(TargetDir)$(TargetFileName)" "C:\Users\rknapp\Documents\GitHub\ValheimMods\Libs\" /q /y /i
+  xcopy "$(TargetDir)$(TargetFileName)" "M:\Code\VapokModBase\References\AugaAPI\" /q /y /i
 ) else (
   xcopy "$(TargetDir)$(TargetFileName)" "C:\Program Files (x86)\Steam\steamapps\common\Valheim\BepInEx\plugins\$(ProjectName)\" /q /y /i
   xcopy "$(TargetDir)$(TargetFileName).mdb" "C:\Program Files (x86)\Steam\steamapps\common\Valheim\BepInEx\plugins\$(ProjectName)\" /q /y /i

Auga/Barber_Setup.cs

@@ -0,0 +1,17 @@
+using HarmonyLib;
+using UnityEngine;
+
+namespace Auga;
+
+[HarmonyPatch]
+public static class Barber_Setup
+{
+    [HarmonyPatch(typeof(PlayerCustomizaton), nameof(PlayerCustomizaton.OnEnable))]
+    public static class PlayerCustomization_Awake_Patch
+    {
+        public static bool Prefix(PlayerCustomizaton __instance)
+        {
+            return !SetupHelper.DirectObjectReplace(__instance.transform, Auga.Assets.AugaBarber, "BarberGui");
+        }
+    }
+}

Auga/Chat_Setup.cs

@@ -12,15 +12,21 @@ public static class Chat_Awake_Patch
         {
             public static bool Prefix(Chat __instance)
             {
-                if (!Auga.AugaChatShow.Value || Auga.HasChatter)
+                if (Auga.HasChatter)
+                    return true;
+
+                if (!Auga.AugaChatShow.Value )
                     return true;
 
                 return !SetupHelper.IndirectTwoObjectReplace(__instance.transform, Auga.Assets.AugaChat, "Chat", "Chat_box", "AugaChat");
             }
 
             public static void Postfix(Chat __instance)
             {
-                if (!Auga.AugaChatShow.Value || Auga.HasChatter)
+                if (Auga.HasChatter)
+                    return;
+
+                if (!Auga.AugaChatShow.Value )
                     return;
 
                 if (__instance.m_input != null)
@@ -33,7 +39,10 @@ public static class Chat_SetNpcText_Patch
         {
             public static void Postfix(Chat __instance)
             {
-                if (!Auga.AugaChatShow.Value || Auga.HasChatter)
+                if (Auga.HasChatter)
+                    return;
+
+                if (!Auga.AugaChatShow.Value)
                     return;
 
                 var latestChatMessage = __instance.m_npcTexts.LastOrDefault();

Auga/Hud_Setup.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection.Emit;
 using AugaUnity;
+using BepInEx;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TMPro;
@@ -17,37 +18,42 @@ namespace Auga
     public static class Hud_Setup
     {
         [HarmonyPatch(nameof(Hud.Awake))]
+        [HarmonyPriority(Priority.First)]
         [HarmonyPostfix]
         public static void Hud_Awake_Postfix(Hud __instance)
         {
-
             var hotkeyBar = __instance.Replace("hudroot/HotKeyBar", Auga.Assets.Hud, "hudroot/HotKeyBar");
             hotkeyBar.gameObject.AddComponent<MovableHudElement>().Init(TextAnchor.UpperLeft, 55, -44);
-
-            __instance.m_statusEffectListRoot = null;
-            __instance.m_statusEffectTemplate = new GameObject("DummyStatusEffectTemplate", typeof(RectTransform)).RectTransform();
+
             var newStatusEffects = __instance.Replace("hudroot/StatusEffects", Auga.Assets.Hud);
-            newStatusEffects.gameObject.AddComponent<MovableHudElement>().Init(TextAnchor.UpperRight, -40, -330);
+            var newTemplate = newStatusEffects.Find("StatusEffectsExt/SE_Template");
+            var newExternalRoot = newStatusEffects.Find("StatusEffectsExt");
+            var newInternalRoot = newStatusEffects.Find("StatusEffectsInt");
+
+            newInternalRoot.gameObject.AddComponent<MovableHudElement>().Init("Status Effect List",TextAnchor.UpperRight, -40, 0);
+            newExternalRoot.gameObject.AddComponent<MovableHudElement>().Init("Abilities and Other Statuses",TextAnchor.UpperRight, -160, 0);
+            __instance.m_statusEffectTemplate = newTemplate.RectTransform();
+            __instance.m_statusEffectListRoot = newExternalRoot.RectTransform();
+
 
             __instance.m_saveIcon = __instance.Replace("hudroot/SaveIcon", Auga.Assets.Hud).gameObject;
             __instance.m_saveIconImage = __instance.m_saveIcon.GetComponent<Image>();
             __instance.m_badConnectionIcon = __instance.Replace("hudroot/BadConnectionIcon", Auga.Assets.Hud).gameObject;
 
 
-
             var originalDreamTexts = __instance.m_sleepingProgress.GetComponent<SleepText>().m_dreamTexts;
             var loadingScreen = __instance.Replace("LoadingBlack", Auga.Assets.Hud);
             __instance.m_loadingScreen = loadingScreen.GetComponent<CanvasGroup>();
             __instance.m_loadingProgress = loadingScreen.Find("Loading").gameObject;
             __instance.m_sleepingProgress = loadingScreen.Find("Sleeping").gameObject;
             __instance.m_teleportingProgress = loadingScreen.Find("Teleporting").gameObject;
             __instance.m_loadingImage = loadingScreen.Find("Loading/Image").GetComponent<Image>();
-            __instance.m_loadingTip = loadingScreen.Find("Loading/Tip").GetComponent<Text>();
+            __instance.m_loadingTip = loadingScreen.Find("Loading/Tip").GetComponent<TMP_Text>();
             __instance.m_sleepingProgress.GetComponent<SleepText>().m_dreamTexts = originalDreamTexts;
 
 
             __instance.m_eventBar = __instance.Replace("hudroot/EventBar", Auga.Assets.Hud).gameObject;
-            __instance.m_eventName = __instance.m_eventBar.GetComponentInChildren<Text>();
+            __instance.m_eventName = __instance.m_eventBar.GetComponentInChildren<TMP_Text>();
             __instance.m_eventBar.gameObject.AddComponent<MovableHudElement>().Init(TextAnchor.UpperCenter, 0, -90);
 
             __instance.m_damageScreen = __instance.Replace("hudroot/Damaged", Auga.Assets.Hud).GetComponent<Image>();
@@ -68,14 +74,15 @@ public static void Hud_Awake_Postfix(Hud __instance)
 
 
             var originalGuardianPowerMaterial = __instance.m_gpIcon.material;
+
             __instance.m_gpRoot = (RectTransform)__instance.Replace("hudroot/GuardianPower", Auga.Assets.Hud);
-            __instance.m_gpName = __instance.m_gpRoot.Find("Name").GetComponent<Text>();
+            __instance.m_gpName = __instance.m_gpRoot.Find("Name").GetComponent<TMP_Text>();
             __instance.m_gpIcon = __instance.m_gpRoot.Find("Icon").GetComponent<Image>();
             __instance.m_gpIcon.material = originalGuardianPowerMaterial;
-            __instance.m_gpCooldown = __instance.m_gpRoot.Find("TimeText").GetComponent<Text>();
+            __instance.m_gpCooldown = __instance.m_gpRoot.Find("GPTimeText").GetComponent<TMP_Text>();
 
             __instance.m_gpRoot.gameObject.AddComponent<MovableHudElement>().Init(TextAnchor.LowerLeft, 60, 70);
-
+            
             foreach (Transform child in __instance.m_healthPanel)
             {
                 Object.Destroy(child.gameObject);
@@ -120,7 +127,7 @@ public static void Hud_Awake_Postfix(Hud __instance)
             __instance.m_eitrText = null;
 
             __instance.m_actionBarRoot = __instance.Replace("hudroot/action_progress", Auga.Assets.Hud).gameObject;
-            __instance.m_actionName = __instance.m_actionBarRoot.GetComponentInChildren<Text>();
+            __instance.m_actionName = __instance.m_actionBarRoot.GetComponentInChildren<TMP_Text>();
             __instance.m_actionProgress = __instance.m_actionBarRoot.GetComponent<GuiBar>();
             __instance.m_actionBarRoot.gameObject.AddComponent<MovableHudElement>().Init("ActionProgress", TextAnchor.LowerCenter, 0, 226);
 
@@ -165,8 +172,8 @@ public static void Hud_Awake_Postfix(Hud __instance)
                 __instance.m_pieceSelectionWindow.AddComponent<MovableHudElement>().Init(TextAnchor.MiddleCenter, 0, 0);
 
                 var selectedPiece = __instance.m_buildHud.transform.Find("SelectedPiece");
-                __instance.m_buildSelection = selectedPiece.Find("Name").GetComponent<Text>();
-                __instance.m_pieceDescription = selectedPiece.Find("Info").GetComponent<Text>();
+                __instance.m_buildSelection = selectedPiece.Find("Name").GetComponent<TMP_Text>();
+                __instance.m_pieceDescription = selectedPiece.Find("Info").GetComponent<TMP_Text>();
                 __instance.m_buildIcon = selectedPiece.Find("Darken/IconBG/PieceIcon").GetComponent<Image>();
                 selectedPiece.gameObject.AddComponent<MovableHudElement>().Init(TextAnchor.LowerCenter, 0, 15);
 
@@ -373,8 +380,8 @@ public static void SetupPieceInfo(Hud instance, Piece piece)
                     GameObject requirementItem = instance.m_requirementItems[piece.m_resources.Length];
                     requirementItem.SetActive(true);
                     Image component1 = requirementItem.transform.Find("res_icon").GetComponent<Image>();
-                    Text component2 = requirementItem.transform.Find("res_name").GetComponent<Text>();
-                    Text component3 = requirementItem.transform.Find("res_amount").GetComponent<Text>();
+                    TMP_Text component2 = requirementItem.transform.Find("res_name").GetComponent<TMP_Text>();
+                    TMP_Text component3 = requirementItem.transform.Find("res_amount").GetComponent<TMP_Text>();
                     UITooltip component4 = requirementItem.GetComponent<UITooltip>();
                     component1.sprite = piece.m_craftingStation.m_icon;
                     component2.text = Localization.instance.Localize(piece.m_craftingStation.m_name);
@@ -617,7 +624,10 @@ public static class Hud_UpdatePieceList_Patch
     {
         public static bool Prefix(Hud __instance, Player player, Vector2Int selectedNr, Piece.PieceCategory category, bool updateAllBuildStatuses)
         {
-            if (!Auga.BuildMenuShow.Value || Auga.HasSearsCatalog)
+            if (Auga.HasSearsCatalog)
+                return true;
+
+            if (!Auga.BuildMenuShow.Value )
                 return true;
 
             var buildPieces = player.GetBuildPieces();
@@ -691,7 +701,10 @@ public static class PieceTable_PrevCategory_Patch
     {
         public static bool Prefix(ref PieceTable __instance)
         {
-            if (!Auga.BuildMenuShow.Value || Auga.HasSearsCatalog)
+            if (Auga.HasSearsCatalog)
+                return true;
+
+            if (!Auga.BuildMenuShow.Value )
                 return true;
 
             return Input.GetAxis("Mouse ScrollWheel") == 0;
@@ -720,7 +733,10 @@ public static class PieceTable_NextCategory_Patch
     {
         public static bool Prefix(ref PieceTable __instance)
         {
-            if (!Auga.BuildMenuShow.Value || Auga.HasSearsCatalog)
+            if (Auga.HasSearsCatalog)
+                return true;
+
+            if (!Auga.BuildMenuShow.Value )
                 return true;
 
             return Input.GetAxis("Mouse ScrollWheel") == 0;