diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d765c26 --- /dev/null +++ b/.gitignore @@ -0,0 +1,340 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates +*.csproj +*.csproj.user +*.sln +*.cache +*.csprojAssemblyReference +*.csproj.CoreCompileInputs + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ +*.cache +*.cache +*.cache +*.cache diff --git a/BuilderEssentials.cs b/BuilderEssentials.cs new file mode 100644 index 0000000..667c170 --- /dev/null +++ b/BuilderEssentials.cs @@ -0,0 +1,90 @@ +using BuilderEssentials.UI; +using Terraria.UI; +using Microsoft.Xna.Framework.Graphics; +using Terraria.ModLoader; +using Microsoft.Xna.Framework; +using System.Collections.Generic; +using Terraria; + +namespace BuilderEssentials +{ + public class BuilderEssentials : Mod + { + public static Texture2D BuildingModeOff; + public static Texture2D BuildingModeOn; + public static bool UIOpen; + internal static BasePanel BasePanel; + internal static UserInterface UserInterface; + + public void LoadTextures() + { + BuildingModeOff = this.GetTexture("UI/Elements/BuildingModeOff"); + BuildingModeOn = this.GetTexture("UI/Elements/BuildingModeOn"); + } + + public override void Load() + { + LoadTextures(); + + if (!Main.dedServ) + { + UserInterface = new UserInterface(); + + BasePanel = new BasePanel(); + BasePanel.Activate(); + + //ShowMyUI(); + } + } + + public override void Unload() + { + BasePanel = null; + } + + private GameTime _lastUpdateUiGameTime; + + public override void UpdateUI(GameTime gameTime) + { + _lastUpdateUiGameTime = gameTime; + if (UserInterface?.CurrentState != null) + UserInterface.Update(gameTime); + + if (Main.playerInventory == true && !UIOpen) + ShowMyUI(); + else if (Main.playerInventory == false && UIOpen) + HideMyUI(); + } + + public override void ModifyInterfaceLayers(List layers) + { + int mouseTextIndex = layers.FindIndex(layer => layer.Name.Equals("Vanilla: Mouse Text")); + if (mouseTextIndex != -1) + { + layers.Insert(mouseTextIndex, new LegacyGameInterfaceLayer( + "MyMod: UserInterface", + delegate + { + if (_lastUpdateUiGameTime != null && UserInterface?.CurrentState != null) + { + UserInterface.Draw(Main.spriteBatch, _lastUpdateUiGameTime); + } + return true; + }, + InterfaceScaleType.UI)); + } + } + + public static void ShowMyUI() + { + UserInterface?.SetState(BasePanel); + UIOpen = true; + } + + public static void HideMyUI() + { + UserInterface?.SetState(null); + UIOpen = false; + } + } +} \ No newline at end of file diff --git a/BuilderPlayer.cs b/BuilderPlayer.cs new file mode 100644 index 0000000..193a85b --- /dev/null +++ b/BuilderPlayer.cs @@ -0,0 +1,53 @@ +using BuilderEssentials.UI; +using System.Collections.Generic; +using Terraria; +using Terraria.ModLoader; +using Terraria.ModLoader.IO; + +namespace BuilderEssentials +{ + public class BuilderPlayer : ModPlayer + { + public List NormalAccessories; + public List BuildingAccessories; + public bool IsNormalAccessories; + + public override void Initialize() + { + NormalAccessories = new List(7); + BuildingAccessories = new List(7); + IsNormalAccessories = true; + } + + public override TagCompound Save() + { + return new TagCompound + { + { "IsNormalAccessories", IsNormalAccessories }, + { "NormalAccessories", NormalAccessories }, + { "BuildingAccessories", BuildingAccessories } + }; + } + + public override void Load(TagCompound tag) + { + if (tag.ContainsKey("IsNormalAccessories")) + IsNormalAccessories = tag.GetBool("IsNormalAccessories"); + + if (tag.ContainsKey("NormalAccessories")) + NormalAccessories = tag.Get>("NormalAccessories"); + + if (tag.ContainsKey("BuildingAccessories")) + BuildingAccessories = tag.Get>("BuildingAccessories"); + } + + public override void OnEnterWorld(Player player) + { + var modPlayer = Main.LocalPlayer.GetModPlayer(); + if (!modPlayer.IsNormalAccessories) + BasePanel.button.SetImage(BuilderEssentials.BuildingModeOn); + else + BasePanel.button.SetImage(BuilderEssentials.BuildingModeOff); + } + } +} diff --git a/UI/BasePanel.cs b/UI/BasePanel.cs new file mode 100644 index 0000000..79294bf --- /dev/null +++ b/UI/BasePanel.cs @@ -0,0 +1,89 @@ +using Terraria; +using Terraria.UI; +using Terraria.GameContent.UI.Elements; +using Microsoft.Xna.Framework.Graphics; + +namespace BuilderEssentials.UI +{ + public class BasePanel : UIState + { + public static UIImageButton button; + public static Texture2D buttonTexture; + public BuilderPlayer modPlayer; + public override void OnInitialize() + { + buttonTexture = BuilderEssentials.BuildingModeOff; + button = new UIImageButton(buttonTexture); + //Bad positionning on screens != 1080p? + button.VAlign = 0.03f; + button.HAlign = 0.272f; + button.OnClick += ChangeAccessories_OnClick; + Append(button); + } + + public void ChangeAccessories_OnClick(UIMouseEvent evt, UIElement listeningElement) + { + modPlayer = Main.LocalPlayer.GetModPlayer(); + CleanAcessoriesList(); + SaveCurrentAccessories(); + modPlayer.IsNormalAccessories = !modPlayer.IsNormalAccessories; + LoadAccessories(); + UpdateButtonImage(); + } + + public void CleanAcessoriesList() + { + modPlayer = Main.LocalPlayer.GetModPlayer(); + + if (modPlayer.IsNormalAccessories) + modPlayer.NormalAccessories.Clear(); + else + modPlayer.BuildingAccessories.Clear(); + } + + //Vanity Accessories start on index 13 + public void SaveCurrentAccessories() + { + modPlayer = Main.LocalPlayer.GetModPlayer(); + int maxAccessoryIndex = 5 + Main.LocalPlayer.extraAccessorySlots; + for (int i = 3; i < 3 + maxAccessoryIndex; i++) + { + Item accessory = modPlayer.player.armor[i]; + if (modPlayer.IsNormalAccessories) + modPlayer.NormalAccessories.Add(accessory); + else + modPlayer.BuildingAccessories.Add(accessory); + } + } + + public void LoadAccessories() + { + modPlayer = Main.LocalPlayer.GetModPlayer(); + + if (modPlayer.IsNormalAccessories) + for (int i = 0; i < modPlayer.NormalAccessories.Count; i++) + { + modPlayer.player.armor[i + 3] = modPlayer.NormalAccessories[i]; + //var myItem = modPlayer.NormalAccessories[i]; + //Main.LocalPlayer.armor[i + 3] = myItem; + } + else + { + for (int i = 0; i < modPlayer.BuildingAccessories.Count; i++) + { + modPlayer.player.armor[i + 3] = modPlayer.BuildingAccessories[i]; + //var myItem = modPlayer.BuildingAccessories[i]; + //Main.LocalPlayer.armor[i + 3] = myItem; + } + } + } + public void UpdateButtonImage() + { + modPlayer = Main.LocalPlayer.GetModPlayer(); + if (modPlayer.IsNormalAccessories) + button.SetImage(BuilderEssentials.BuildingModeOff); + else + button.SetImage(BuilderEssentials.BuildingModeOn); + } + } +} diff --git a/UI/Elements/BuildingModeOff.png b/UI/Elements/BuildingModeOff.png new file mode 100644 index 0000000..2516d1b Binary files /dev/null and b/UI/Elements/BuildingModeOff.png differ diff --git a/UI/Elements/BuildingModeOn.png b/UI/Elements/BuildingModeOn.png new file mode 100644 index 0000000..9f830cd Binary files /dev/null and b/UI/Elements/BuildingModeOn.png differ diff --git a/build.txt b/build.txt new file mode 100644 index 0000000..1c3954c --- /dev/null +++ b/build.txt @@ -0,0 +1,3 @@ +displayName = Builder Essentials +author = Kirtle +version = 0.1 \ No newline at end of file diff --git a/description.txt b/description.txt new file mode 100644 index 0000000..8e2e154 --- /dev/null +++ b/description.txt @@ -0,0 +1,6 @@ +Builder Essentials is a mod designed to help and improve building in survival. + +It features a toggleable secondary accessories system so you can always have your building accessories ready to be used, without filling your inventory! + +In the future, I hope to implement more helpful features to complement this mod. +Happy Building! Kirtle \ No newline at end of file diff --git a/icon.png b/icon.png new file mode 100644 index 0000000..82d0276 Binary files /dev/null and b/icon.png differ