diff --git a/.gitattributes b/.gitattributes index 4b9955f..1ff0c42 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,7 +10,7 @@ # default for csharp files. # Note: This is only used by command line ############################################################################### -*.cs diff=csharp +#*.cs diff=csharp ############################################################################### # Set the merge driver for project and solution files @@ -22,39 +22,27 @@ # these files as binary and thus will always conflict and require user # intervention with every merge. To do so, just uncomment the entries below ############################################################################### -*.sln merge=binary -*.csproj merge=binary -*.vbproj merge=binary -*.vcxproj merge=binary -*.vcproj merge=binary -*.dbproj merge=binary -*.fsproj merge=binary -*.lsproj merge=binary -*.wixproj merge=binary -*.modelproj merge=binary -*.sqlproj merge=binary -*.wwaproj merge=binary -*.user merge=binary +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary ############################################################################### # behavior for image files # # image files are treated as binary by default. ############################################################################### -*.jpg binary -*.jpeg binary -*.png binary -*.gif binary -*.tif binary -*.tiff binary -*.ico binary -# SVG treated as an asset (binary) by default. -# *.svg text -# If you want to treat it as binary, -# use the following line instead. -*.svg binary -*.eps binary -*.webp binary +#*.jpg binary +#*.png binary +#*.gif binary ############################################################################### # diff behavior for common document formats @@ -63,66 +51,13 @@ # is only available from the command line. Turn it on by uncommenting the # entries below. ############################################################################### -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain -*.bibtex text diff=bibtex -*.md text -*.tex text diff=tex -*.adoc text -*.textile text -*.mustache text -*.csv text -*.tab text -*.tsv text -*.txt text -*.sql text -*.ps1 text -*.props text -*.config text -.DotSettings text -LICENSE text - -# Scripts -*.bash text eol=lf -*.fish text eol=lf -*.sh text eol=lf -# These are explicitly windows files and should use crlf -*.bat text eol=crlf -*.cmd text eol=crlf - -# Serialisation -*.json text -*.toml text -*.xml text -*.yaml text -*.yml text - -# Archives -*.7z binary -*.gz binary -*.tar binary -*.tgz binary -*.zip binary -*.rar binary - -# Unity -*.unitypackage binary -*.manifest merge=binary - -# Text files where line endings should be preserved -*.patch -text - -# -# Exclude files from exporting -# -.gitattributes export-ignore -.gitignore export-ignore -.gitkeep export-ignore +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.github/workflows/nuget.autoupdate.yml b/.github/workflows/nuget.autoupdate.yml new file mode 100644 index 0000000..da202a4 --- /dev/null +++ b/.github/workflows/nuget.autoupdate.yml @@ -0,0 +1,19 @@ +name: Automated NuGet Dependency Updates + +concurrency: ci-${{ github.ref }} + +on: + workflow_dispatch: + + schedule: + - cron: "0/30 16-23,0-9 * * *" + +env: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: true + +jobs: + call-workflow-nuget-autoupdate: + uses: Digitalroot-Valheim/.github/.github/workflows/nuget.autoupdate.yml@main + secrets: + github-pat: ${{ secrets.AUTOMATED_DEPENDENCY_UPDATES_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ddc8d44..80d0851 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,11 +3,14 @@ name: Release concurrency: ci-${{ github.ref }} on: + workflow_dispatch: push: branches: [ main ] # Default release branch - paths: - - 'src/**' - - '.github/workflows/**' + paths-ignore: + - '.github/**' + - 'docs/**' + - '**/.ts/**' + - '**/.nx/**' env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true @@ -15,27 +18,23 @@ env: jobs: call-workflow-nuget-release: - if: ${{ false }} # disable for now uses: Digitalroot-Valheim/.github/.github/workflows/nuget.release.yml@main secrets: aws-access-key-id: ${{ secrets.NUGET_S3_REPO_KEY_ID }} aws-secret-access-key: ${{ secrets.NUGET_S3_REPO_KEY_SECRET }} - #nexus-api-key: ${{ secrets.NEXUS_API_KEY }} - #nexus-cookies-header: ${{ secrets.NEXUS_COOKIE_HEADER }} - #nuget-org-key: ${{ secrets.NUGET_ORG_PAT }} - + nexus-api-key: ${{ secrets.NEXUS_API_KEY }} + nexus-cookie-nxid-header: ${{ secrets.NEXUS_COOKIE_HEADER_NEXUSID }} + nexus-cookie-sid-header: ${{ secrets.NEXUS_COOKIE_HEADER_SID_DEVELOP }} + ts-api-key: ${{ secrets.TS_SERVICEACCOUNT }} + with: - sln-file-name: Digitalroot.Valheim.Common.Placeholder - proj-file-name: Digitalroot.Valheim.Common.Placeholder - #src-path: src - #unit-test-path: UnitTests - #skip-unit-tests: true - #force-assembly-version: true - #create-github-release: false - #aws-region: us-west-2 - #is-nuget-package: false - #nuget-gh-upload: true - #nuget-s3-upload: true - #nuget-org-upload: true - #nexus-enable-upload: true - #nexus-mod-id: 000 \ No newline at end of file + sln-file-name: Digitalroot.Valheim.EternalFire + proj-file-name: Digitalroot.Valheim.EternalFire + is-nuget-package: false + nexus-enable-upload: false + nexus-mod-id: 1463 + ts-enable-upload: false + ts-name: Eternal_Fire + ts-description: "Keeps fires burning." + ts-categories: "server-side client-side tweaks" #https://thunderstore.io/api/experimental/community/valheim/category/ + ts-dependencies: denikson-BepInExPack_Valheim@5.4.2105 ValheimModding-Jotunn@2.11.5 diff --git a/.gitignore b/.gitignore index dfcfd56..8ee83e1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,11 +23,13 @@ mono_crash.* [Rr]eleases/ x64/ x86/ +[Ww][Ii][Nn]32/ [Aa][Rr][Mm]/ [Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ +[Oo]ut/ [Ll]og/ [Ll]ogs/ @@ -61,6 +63,9 @@ project.lock.json project.fragment.lock.json artifacts/ +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + # StyleCop StyleCopReport.xml @@ -137,6 +142,11 @@ _TeamCity* .axoCover/* !.axoCover/settings.json +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + # Visual Studio code coverage results *.coverage *.coveragexml @@ -348,3 +358,7 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd +/BetterTrader.old diff --git a/LICENSE b/LICENSE index 0ad25db..e69de29 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/docs/README.md b/docs/README.md index 198fb56..c9d40f3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,32 +1,14 @@ -Structuring your Thunderstore package -https://github.com/ebkr/r2modmanPlus/wiki/Structuring-your-Thunderstore-package +# Eternal Fire -Manifest V1 (Thunderstore) + author field -https://github.com/ebkr/r2modmanPlus/wiki/Installing-mods-locally#manifest-v1-thunderstore--author-field +## Summary - -Move me to [gitrepo]/doc - -# Summary -This is a port of ModTemplate to JVL -PR: https://github.com/Atokal/AtosArrows/pull/3 -Assets belong to Atokal and are used with permission because of: -- Asset use permission You are allowed to use the assets in this file without permission or crediting me. https://www.nexusmods.com/valheim/mods/969 (June 12, 2021) - -Original Mod: https://www.nexusmods.com/valheim/mods/969 - -**Code is a complete rewrite.** +Keeps fires burning. ## License -Original source has no license. -JVL Version is released under: **GNU Affero General Public License v3.0** - -## ModTemplate -Adds several new arrows into the game. Expands arrow progression for fighting tougher enemies! +**GNU Affero General Public License v3.0** -New Items: -- Stone Arrow -- Blunted Arrow +## Details +Keeps fires lit and burning without needing to fuel them. ### Dependencies - BepInExPack Valheim @@ -37,17 +19,33 @@ New Items: 1. Extract the archive into <Steam Location>\steamapps\common\Valheim\BepInEx\plugins ### Configuration -- No need to configure. + +| Config | Category | Data Type | Desc | +| --- | --- | --- | --- | +| Campfire | Fireplaces | bool | Enable Campfire | +| Bonfire | Fireplaces | bool | Enable Bonfire | +| Sconce | Fireplaces | bool | Enable Sconce | +| StandingWoodTorch | Fireplaces | bool | Enable Standing Wood Torch | +| StandingIronTorch | Fireplaces | bool | Enable Standing Iron Torch | +| StandingGreenBurningIronTorch | Fireplaces | bool | Enable Standing Green Burning Iron Torch | +| StandingBlueBurningIronTorch | Fireplaces | bool | Enable Standing Blue Burning Iron Torch | +| StandingBrazier | Fireplaces | bool | Enable Standing Brazier | +| HangingBrazier | Fireplaces | bool | Enable Hanging Brazier | +| Hearth | Fireplaces | bool | Enable Hearth | +| HotTub | Fireplaces | bool | Enable Hot Tub | +| JackOTurnip | Fireplaces | bool | Enable Jack O' Turnip | +| StoneOven | Cooking Stations | bool | Enable Stone Oven | +| Smelter | Smelters | bool | Enable Smelter | +| BlastFurnace | Smelters | bool | Enable Blast Furnace | +| EitrRefinery | Smelters | bool | Enable Eitr Refinery | +| CustomPrefabs | Custom | string | A comma-separated list of prefab names | ### Issues/Questions/Bugs - Use the repo issues tab above. ### Support Me @ https://www.buymeacoffee.com/digitalroot - -### Thanks to -- Atokal - +

-Digitalroot can be found in the Odin Plus Team Discord
- +Digitalroot can be found in the Valhalla Legends Discord

+

diff --git a/src/Digitalroot.Valheim.EternalFire.sln b/src/Digitalroot.Valheim.EternalFire.sln new file mode 100644 index 0000000..8f0834f --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire.sln @@ -0,0 +1,52 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33122.133 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Digitalroot.Valheim.EternalFire", "Digitalroot.Valheim.EternalFire\Digitalroot.Valheim.EternalFire.csproj", "{73CF24C1-0509-43B3-A72B-90720901BF76}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{53F5499F-33B0-438A-B383-08CA50F1537E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "worklfows", "worklfows", "{1A2C7529-FAA6-4705-9AD2-363DD17D6268}" + ProjectSection(SolutionItems) = preProject + ..\.github\workflows\discord.yml = ..\.github\workflows\discord.yml + ..\.github\workflows\nuget.autoupdate.yml = ..\.github\workflows\nuget.autoupdate.yml + ..\.github\workflows\release.yml = ..\.github\workflows\release.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{1EE29341-01DD-4652-AA4D-611DE75CB106}" + ProjectSection(SolutionItems) = preProject + ..\docs\README.md = ..\docs\README.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F1DB36F5-73E7-4ED2-94FF-F19B28284A0D}" + ProjectSection(SolutionItems) = preProject + ..\.gitattributes = ..\.gitattributes + ..\.gitignore = ..\.gitignore + ..\LICENSE = ..\LICENSE + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + DebugNoDeploy|Any CPU = DebugNoDeploy|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {73CF24C1-0509-43B3-A72B-90720901BF76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73CF24C1-0509-43B3-A72B-90720901BF76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73CF24C1-0509-43B3-A72B-90720901BF76}.DebugNoDeploy|Any CPU.ActiveCfg = DebugNoDeploy|Any CPU + {73CF24C1-0509-43B3-A72B-90720901BF76}.DebugNoDeploy|Any CPU.Build.0 = DebugNoDeploy|Any CPU + {73CF24C1-0509-43B3-A72B-90720901BF76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73CF24C1-0509-43B3-A72B-90720901BF76}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {1A2C7529-FAA6-4705-9AD2-363DD17D6268} = {53F5499F-33B0-438A-B383-08CA50F1537E} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F8F84D08-DEB1-44D1-819E-5195C3DC4FA7} + EndGlobalSection +EndGlobal diff --git a/src/Digitalroot.Valheim.EternalFire/.nx/description.bbcode.txt b/src/Digitalroot.Valheim.EternalFire/.nx/description.bbcode.txt new file mode 100644 index 0000000..6e23073 --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/.nx/description.bbcode.txt @@ -0,0 +1,38 @@ +[size=3]Valheim mod to mute Misophonia triggering sounds. +[/size][b][size=4] +License +[/size][/b][size=3][url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MisophoniaFriendly/blob/main/LICENSE]GNU Affero General Public License v3.0[/url][/size][size=3] +[/size][size=3]Closed-source license is available for commercial use.[/size] + +[b][size=4]Source[/size][/b] +[size=3][url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MisophoniaFriendly]GitHub[/url][/size] + +[b][size=4]Digitalroot's Max Dungeon Rooms[/size][/b] +[size=3]Mutes Misophonia triggering sounds. [/size] +[list] +[*][size=3]Puke[/size] +[*][size=3]Eat[/size] +[/list] +[b][size=4]Installation (manual)[/size][/b] +[list=1] +[*][size=3]Download the latest release archive (zip) file.[/size] +[*][size=3]Extract the archive into \steamapps\common\Valheim\BepInEx\plugins[/size] +[/list] +[b][size=4]Configuration[/size][/b][size=3] +[/size][list] +[*][size=3]No need to configure.[/size] +[/list] +[b][size=4]Issues/Bugs[/size][/b] +[size=3]Open an issue or bug on the [url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MisophoniaFriendly/issues]issue board[/url].[/size] + +[b][size=4]Questions[/size][/b] +[size=3]Ask a question on the [url=https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MisophoniaFriendly/discussions]discussions board[/url].[/size] + +[b][size=4]Support Me[/size][/b] @ [url=https://www.buymeacoffee.com/digitalroot]https://www.buymeacoffee.com/digitalroot[/url] + + +[center][size=3][b][color=#00ffff]Digitalroot can be found in the following Discords[/color][/b][/size] +[url=https://discord.gg/Xh3UHcDC][img]https://digitalroot.net/img/jvldisc.png[/img][/url] +[url=https://discord.gg/randyknappmods][img]https://digitalroot.net/img/epiclootdisc.png[/img][/url] +[url=https://discord.gg/mbkPcvu9ax][img]https://digitalroot.net/img/odinplusdisc.png[/img][/url] +[/center] diff --git a/src/Digitalroot.Valheim.EternalFire/.ts/icon.png b/src/Digitalroot.Valheim.EternalFire/.ts/icon.png new file mode 100644 index 0000000..eb14a92 Binary files /dev/null and b/src/Digitalroot.Valheim.EternalFire/.ts/icon.png differ diff --git a/src/Digitalroot.Valheim.EternalFire/.ts/manifest.json b/src/Digitalroot.Valheim.EternalFire/.ts/manifest.json new file mode 100644 index 0000000..4b90e73 --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/.ts/manifest.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://raw.githubusercontent.com/Digitalroot-Valheim/Digitalroot.Valheim.Common.Interfaces/main/src/json/tsio-manifest.json", + "name": "Eternal_Fire", + "author": "Digitalroot", + "description": "Keeps fires lit and burning without needing to fuel them.", + "version_number": "%VERSION_NUMBER%", + "dependencies": [ + "denikson-BepInExPack_Valheim-5.4.2105", + "ValheimModding-Jotunn-2.11.5" + ], + "website_url": "https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.EternalFire" +} diff --git a/src/Digitalroot.Valheim.EternalFire/AssemblyInfo.cs b/src/Digitalroot.Valheim.EternalFire/AssemblyInfo.cs new file mode 100644 index 0000000..81ac32f --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/AssemblyInfo.cs @@ -0,0 +1,39 @@ +using Digitalroot.Valheim.EternalFire; +using Digitalroot.Valheim.Common; + + +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle(Main.Namespace)] +[assembly: AssemblyDescription(Main.Name)] +[assembly: AssemblyConfiguration(AssemblyInfo.Configuration)] +[assembly: AssemblyCompany(AssemblyInfo.Company)] +[assembly: AssemblyProduct(AssemblyInfo.Product)] +[assembly: AssemblyCopyright(AssemblyInfo.Copyright)] +[assembly: AssemblyTrademark(AssemblyInfo.Trademark)] +[assembly: AssemblyCulture(AssemblyInfo.Culture)] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("3ccc4dc1-5b17-47c1-b996-ca03b8639a61")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion(Main.Version)] +[assembly: AssemblyFileVersion(Main.Version)] diff --git a/src/Digitalroot.Valheim.EternalFire/Digitalroot.Valheim.EternalFire.csproj b/src/Digitalroot.Valheim.EternalFire/Digitalroot.Valheim.EternalFire.csproj new file mode 100644 index 0000000..387a6d3 --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/Digitalroot.Valheim.EternalFire.csproj @@ -0,0 +1,81 @@ + + + + Digitalroot.Valheim.EternalFire + net48 + 10 + Digitalroot.Valheim.EternalFire + False + True + embedded + false + false + true + AGPL-3.0-or-later + Copyright © Digitalroot Technologies 2021 - 2024 + https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.EternalFire + https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.EternalFire + git + Digitalroot + Digitalroot Technologies + Digitalroot Valheim Digitalroot.Valheim.EternalFire + Digitalroot.Valheim.EternalFire for Valheim + en-US + true + README.md + + https://nuget.bepinex.dev/v3/index.json; + https://digitalroot-valheim-nuget.s3.us-west-2.amazonaws.com/index.json + + 0.0.1 + Debug;Release;DebugNoDeploy + + + + + + + + + + + + + + + all + runtime + + + all + + + all + runtime + compile; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all + runtime + compile; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + + + + diff --git a/src/Digitalroot.Valheim.EternalFire/FodyWeavers.xml b/src/Digitalroot.Valheim.EternalFire/FodyWeavers.xml new file mode 100644 index 0000000..4717580 --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Digitalroot.Valheim.EternalFire/Main.cs b/src/Digitalroot.Valheim.EternalFire/Main.cs new file mode 100644 index 0000000..ec8231f --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/Main.cs @@ -0,0 +1,194 @@ +using BepInEx; +using BepInEx.Configuration; +using Digitalroot.Valheim.Common; +using HarmonyLib; +using JetBrains.Annotations; +using Jotunn.Utils; +using System; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; + +namespace Digitalroot.Valheim.EternalFire +{ + [BepInPlugin(Guid, Name, Version)] + [BepInDependency(Jotunn.Main.ModGuid, "2.11.5")] + [NetworkCompatibility(CompatibilityLevel.EveryoneMustHaveMod, VersionStrictness.Minor)] + [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] + public partial class Main : BaseUnityPlugin, ITraceableLogging + { + private Harmony _harmony; + public static Main Instance; + + // [UsedImplicitly] public static ConfigEntry NexusId; + private readonly Harmony harmony = new Harmony(Guid); + public static ConfigEntry NexusId { get; private set; } + private static ConfigEntry config_fire_pit; + private static ConfigEntry config_bonfire; + private static ConfigEntry config_hearth; + private static ConfigEntry config_piece_walltorch; + private static ConfigEntry config_piece_groundtorch; + private static ConfigEntry config_piece_groundtorch_wood; + private static ConfigEntry config_piece_groundtorch_green; + private static ConfigEntry config_piece_groundtorch_blue; + private static ConfigEntry config_piece_brazierfloor01; + private static ConfigEntry config_piece_brazierceiling01; + private static ConfigEntry config_piece_jackoturnip; + private static ConfigEntry config_piece_oven; + private static ConfigEntry config_smelter; + private static ConfigEntry config_blastfurnace; + private static ConfigEntry config_eitrrefinery; + private static ConfigEntry config_piece_bathtub; + private static ConfigEntry config_custom_instance; + + public Main() + { + Instance = this; + #if DEBUG + EnableTrace = true; + Log.RegisterSource(Instance); + #else + EnableTrace = false; + #endif + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); + } + + [UsedImplicitly] + private void Awake() + { + try + { + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); + NexusId = Config.Bind("General", "NexusID", 0000, new ConfigDescription("Nexus mod ID for updates", null, new ConfigurationManagerAttributes { Browsable = false, ReadOnly = true })); + config_fire_pit = Config.Bind("Fireplaces", "CampFire", true, "Enable Campfire"); + config_bonfire = Config.Bind("Fireplaces", "Bonfire", true, "Enable Bonfire"); + config_piece_walltorch = Config.Bind("Fireplaces", "Sconce", true, "Enable Sconce"); + config_piece_groundtorch = Config.Bind("Fireplaces", "StandingIronTorch", true, "Enable Standing Iron Torch"); + config_piece_groundtorch_wood = Config.Bind("Fireplaces", "StandingWoodTorch", true, "Enable Standing Wood Torch"); + config_piece_groundtorch_green = Config.Bind("Fireplaces", "StandingGreenBurningIronTorch", true, "Enable Standing Green Burning Iron Torch"); + config_piece_groundtorch_blue = Config.Bind("Fireplaces", "StandingBlueBurningIronTorch", true, "Enable Standing Blue Burning Iron Torch"); + config_piece_brazierfloor01 = Config.Bind("Fireplaces", "StandingBrazier", true, "Enable Standing Brazier"); + config_piece_brazierceiling01 = Config.Bind("Fireplaces", "HangingBrazier", true, "Enable Hanging Brazier"); + config_piece_jackoturnip = Config.Bind("Fireplaces", "JackOTurnip", true, "Enable Jack-o-turnip"); + config_hearth = Config.Bind("Fireplaces", "Hearth", true, "Enable Hearth"); + config_piece_bathtub = Config.Bind("Fireplaces", "HotTub", true, "Enable Hot tub"); + config_piece_oven = Config.Bind("CookingStations", "StoneOven", true, "Enable Stone oven"); + config_smelter = Config.Bind("Smelters", "Smelter", false, "Enable Smelter"); + config_blastfurnace = Config.Bind("Smelters", "BlastFurnace", false, "Enable Blast furnace"); + config_eitrrefinery = Config.Bind("Smelters", "EitrRefinery", false, "Enable Eitr refinery"); + config_custom_instance = Config.Bind("Custom", "CustomPrefabs", "", "A comma-separated list of prefab names"); + + _harmony = Harmony.CreateAndPatchAll(typeof(Main).Assembly, Guid); + } + catch (Exception e) + { + Log.Error(Instance, e); + } + } + + [UsedImplicitly] + private void OnDestroy() + { + try + { + Log.Trace(Instance, $"{Namespace}.{MethodBase.GetCurrentMethod()?.DeclaringType?.Name}.{MethodBase.GetCurrentMethod()?.Name}"); + _harmony?.UnpatchSelf(); + } + catch (Exception e) + { + Log.Error(Instance, e); + } + } + + public static async void Refuel(ZNetView znview) + { + await Task.Delay(33); + znview.InvokeRPC("AddFuel"); + } + + public static bool ConfigCheck(string instanceName) + { + bool EternalFuel = false; + switch (instanceName) + { + case "fire_pit(Clone)": + EternalFuel = config_fire_pit.Value; + break; + + case "bonfire(Clone)": + EternalFuel = config_bonfire.Value; + break; + + case "hearth(Clone)": + EternalFuel = config_hearth.Value; + break; + + case "piece_walltorch(Clone)": + EternalFuel = config_piece_walltorch.Value; + break; + + case "piece_groundtorch(Clone)": + EternalFuel = config_piece_groundtorch.Value; + break; + + case "piece_groundtorch_wood(Clone)": + EternalFuel = config_piece_groundtorch_wood.Value; + break; + + case "piece_groundtorch_green(Clone)": + EternalFuel = config_piece_groundtorch_green.Value; + break; + + case "piece_groundtorch_blue(Clone)": + EternalFuel = config_piece_groundtorch_blue.Value; + break; + + case "piece_brazierfloor01(Clone)": + EternalFuel = config_piece_brazierfloor01.Value; + break; + + case "piece_brazierceiling01(Clone)": + EternalFuel = config_piece_brazierceiling01.Value; + break; + + case "piece_jackoturnip(Clone)": + EternalFuel = config_piece_jackoturnip.Value; + break; + + case "piece_oven(Clone)": + EternalFuel = config_piece_oven.Value; + break; + + case "smelter(Clone)": + EternalFuel = config_smelter.Value; + break; + + case "blastfurnace(Clone)": + EternalFuel = config_blastfurnace.Value; + break; + + case "eitrrefinery(Clone)": + EternalFuel = config_eitrrefinery.Value; + break; + + case "piece_bathtub(Clone)": + EternalFuel = config_piece_bathtub.Value; + break; + } + + if (config_custom_instance.Value.Split(',').Contains(instanceName.Remove(instanceName.Length - 7))) EternalFuel = true; + return EternalFuel; + } + + #region Implementation of ITraceableLogging + + /// + public string Source => Namespace; + + /// + public bool EnableTrace { get; } + + #endregion + } +} diff --git a/src/Digitalroot.Valheim.EternalFire/MetaData.cs b/src/Digitalroot.Valheim.EternalFire/MetaData.cs new file mode 100644 index 0000000..dbdd9a1 --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/MetaData.cs @@ -0,0 +1,13 @@ +using System.Diagnostics.CodeAnalysis; + +namespace Digitalroot.Valheim.EternalFire +{ + [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] + public partial class Main + { + public const string Version = "0.0.1"; + public const string Name = "Eternal Fire"; + public const string Guid = "digitalroot.mods.eternalFire"; + public const string Namespace = "Digitalroot.Valheim" + nameof(Digitalroot.Valheim.EternalFire); + } +} diff --git a/src/Digitalroot.Valheim.EternalFire/Patch.cs b/src/Digitalroot.Valheim.EternalFire/Patch.cs new file mode 100644 index 0000000..14eccd3 --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/Patch.cs @@ -0,0 +1,70 @@ +using HarmonyLib; +using JetBrains.Annotations; + +namespace Digitalroot.Valheim.EternalFire +{ + [UsedImplicitly] + public class Patch + { + [HarmonyPatch] + public class PatchFireplaceUpdateFireplace + { + [HarmonyPrefix, HarmonyPatch(typeof(Fireplace), nameof(Fireplace.UpdateFireplace))] + static void Prefix(ref Fireplace __instance, ref ZNetView ___m_nview) + { + if (Main.ConfigCheck(__instance.name)) ___m_nview.GetZDO().Set("fuel", __instance.m_maxFuel); + } + } + + #region CookingStation + + [HarmonyPatch] + public class PatchCookingStationSetFuel + { + [HarmonyPrefix, HarmonyPatch(typeof(CookingStation), nameof(CookingStation.SetFuel))] + static void Prefix(ref CookingStation __instance, ref float fuel) + { + if (Main.ConfigCheck(__instance.name)) fuel = __instance.m_maxFuel; + } + } + + [HarmonyPatch] + public class PatchCookingStationAwake + { + [HarmonyPostfix, HarmonyPatch(typeof(CookingStation), nameof(CookingStation.Awake))] + static void Postfix(ref CookingStation __instance, ref ZNetView ___m_nview) + { + if (!___m_nview.isActiveAndEnabled || Player.m_localPlayer == null || Player.m_localPlayer.IsTeleporting()) return; + if (Main.ConfigCheck(__instance.name)) Main.Refuel(___m_nview); + } + } + + #endregion + + #region Smelter + + [HarmonyPatch] + public class PatchSmelterSetFuel + { + [HarmonyPrefix, HarmonyPatch(typeof(Smelter), nameof(Smelter.SetFuel))] + static void Prefix(ref Smelter __instance, ref float fuel) + { + if (Main.ConfigCheck(__instance.name)) fuel = __instance.m_maxFuel; + } + } + + [HarmonyPatch] + public class PatchSmelterAwake + { + [HarmonyPostfix, HarmonyPatch(typeof(Smelter), nameof(Smelter.Awake))] + static void Postfix(ref Smelter __instance, ref ZNetView ___m_nview) + { + if (!___m_nview.isActiveAndEnabled || Player.m_localPlayer == null || Player.m_localPlayer.IsTeleporting()) return; + + if (Main.ConfigCheck(__instance.name)) Main.Refuel(___m_nview); + } + } + + #endregion + } +} diff --git a/src/Digitalroot.Valheim.EternalFire/TemplateOutputs.txt b/src/Digitalroot.Valheim.EternalFire/TemplateOutputs.txt new file mode 100644 index 0000000..b8ef946 --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/TemplateOutputs.txt @@ -0,0 +1,18 @@ +rootnamespace=$rootnamespace$ +clrversion=4.0.30319.42000 +guid[1-10]=4725d2f5-fbb1-4caa-bec4-72022495c1a6 +itemname=TemplateOutputs +machinename=FIRESTORM +projectname=Digitalroot.Valheim.EternalFire +registeredorganization= +defaultnamespace=$defaultnamespace$ +safeitemname=TemplateOutputs +safeitemrootname=TemplateOutputs +safeprojectname=Digitalroot.Valheim.EternalFire +targetframeworkversion=4.7.2 +time=12/12/2022 6:38:13 PM +specifiedsolutionname= +userdomain=FIRESTORM +username=nkd +webnamespace=$webnamespace$ +year=2022 \ No newline at end of file diff --git a/src/Digitalroot.Valheim.EternalFire/packages.lock.json b/src/Digitalroot.Valheim.EternalFire/packages.lock.json new file mode 100644 index 0000000..ed5d88c --- /dev/null +++ b/src/Digitalroot.Valheim.EternalFire/packages.lock.json @@ -0,0 +1,144 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.8": { + "BepInEx.Core": { + "type": "Direct", + "requested": "[5.4.21, 5.4.21]", + "resolved": "5.4.21", + "contentHash": "NMUPlbHTTfJ+qIQCI90uIvjuUQ4wnwt4cpRsK3ItBh1DhsWFzAHXNiZjBxZkPysljEKQ2iu89sxMTga4bxBXVQ==", + "dependencies": { + "BepInEx.BaseLib": "5.4.20", + "HarmonyX": "2.7.0" + } + }, + "Digitalroot.Valheim.Build.Targets": { + "type": "Direct", + "requested": "[1.0.21, )", + "resolved": "1.0.21", + "contentHash": "8mErk3UFjy80d9IlTjXNsofT7YfKLz897YE10ieB/SHNbBorzwVCPYRGsmuaNH8HyqjKQH3KnK4gDwDMBEC+DQ==" + }, + "Digitalroot.Valheim.Common.AssemblyInfo": { + "type": "Direct", + "requested": "[1.0.16, )", + "resolved": "1.0.16", + "contentHash": "+QeepsgH/cRv93h1NrhKLnjARUYNplFWVrFX4MBYLV2K2MQ9hGWV/bhR4As/2IOeNVKX42x5wJqw4YFbZLky/w==" + }, + "Digitalroot.Valheim.Common.Log": { + "type": "Direct", + "requested": "[1.1.46, )", + "resolved": "1.1.46", + "contentHash": "WgwWYfcJJae4pQI0oRxkLj/NvFvYILo4p2P3nQkLX0i9fPpVB+eDlgAGUEsyG76PmsM/N7eZpGeiFvbnSDEEJQ==", + "dependencies": { + "Digitalroot.Valheim.Common.Json": "1.0.34" + } + }, + "Digitalroot.Valheim.Common.Names": { + "type": "Direct", + "requested": "[1.4.18, )", + "resolved": "1.4.18", + "contentHash": "FqjWNLeVXk6J14c7GWftZ8aIpsqPJ3uXKy+HXgS66SjED/h6j5EEirUZnDMGe7A/6GboNUA06/JDp3R8qfR2kg==", + "dependencies": { + "Digitalroot.Valheim.Common.Utils": "1.0.55" + } + }, + "Digitalroot.Valheim.Common.References": { + "type": "Direct", + "requested": "[0.217.38, )", + "resolved": "0.217.38", + "contentHash": "y8KIE7aSMeFytv1ks7CJIoDLWUPN4vzaSkWN2r4kDhkoq65rmmxB1UsjI+VZvfs9LZ5COfZwdQlz628/2Nclgg==" + }, + "Digitalroot.Valheim.Common.Utils": { + "type": "Direct", + "requested": "[1.0.55, )", + "resolved": "1.0.55", + "contentHash": "J9VWU0c+GLXvUYKlBx0zeN5t49iCEnYWC27O2/CSC6IitOe3tR3YhSCanFvAQPNuR0UOpjmbUgHegA3t6NS6AQ==", + "dependencies": { + "Digitalroot.Valheim.Common.Log": "1.1.46" + } + }, + "Digitalroot.Valheim.References.JvL": { + "type": "Direct", + "requested": "[2.15.2, )", + "resolved": "2.15.2", + "contentHash": "+GcLrGLT7mqaniFbBthYMNgRClTbDP0VSEBN+Leo56rDm4YFHbZVUanXOzJK+dWIEtttIeDINKtAJt4iljjdiw==" + }, + "ErrorProne.NET.CoreAnalyzers": { + "type": "Direct", + "requested": "[0.1.2, )", + "resolved": "0.1.2", + "contentHash": "RQdzUtFVhwLwisP2Du7Ugm7ldwAzc+QJrlZWNIwHXcgq4b5fLwZgdN1203RdYiHS8OOALophC6yWekxu3UgN2g==" + }, + "Fody": { + "type": "Direct", + "requested": "[6.6.0, 6.6.0]", + "resolved": "6.6.0", + "contentHash": "NWWM8KiR9DGiAi47q9px9oI27xYBiM5KXxSnI4R5mz2/rG8LIcXJfw5zDLLH1xOgzqRNJgc8KTPQPoiQCidYUw==" + }, + "ILMerge.Fody": { + "type": "Direct", + "requested": "[1.22.0, 1.22.0]", + "resolved": "1.22.0", + "contentHash": "VCWQM8q7wZwHMgksBsFfbImRUmlgn7E6EKkrnUV86/keqBvMTjhlA7mBYtz6Dace8XsJYufYJvRP25uur5W5WA==", + "dependencies": { + "Fody": "6.3.0" + } + }, + "BepInEx.BaseLib": { + "type": "Transitive", + "resolved": "5.4.20", + "contentHash": "0bXgYxbCEN2Ixp3kiFEhyw+RASeFQeg/ww+lbMt7if6XMeVS60eg6epNsMA8Jbx57dmNOzNevkKKw8mP8SUMqw==" + }, + "Digitalroot.References.Unity": { + "type": "Transitive", + "resolved": "2022.3.12", + "contentHash": "QgMwg+WAnbvmjxSuL+PKjr+35B0FhO0Thw9ddoSBrfBkYsMSCYAqJ0APsN2AQfXn3zVdJgP7Rw2S41DJfuBxRQ==" + }, + "Digitalroot.Valheim.Common.Json": { + "type": "Transitive", + "resolved": "1.0.34", + "contentHash": "L7xiFHkundjUriPdJeqpy+V65EjaJpIrQu925VV1E1JbvL16jcVDY32Hj5HoREUEe1Tn8VJSYJBU6SJTqha2kw==", + "dependencies": { + "Digitalroot.References.Unity": "2022.3.12", + "Digitalroot.Valheim.Common.References": "0.217.30", + "fastJSON": "2.4.0.4" + } + }, + "fastJSON": { + "type": "Transitive", + "resolved": "2.4.0.4", + "contentHash": "lbxY+miTOvCNbNfOk8HcbmBD9F6wv2dRKZlMjtJBm6rjA5vFKXBYtR6eoIe96HnCHOE1nCJbMsaZDKGNPg5mIA==" + }, + "HarmonyX": { + "type": "Transitive", + "resolved": "2.7.0", + "contentHash": "lec/SkduQspMa3Pi/nM/NSvA84Za8HCCWA8ybdToKiTqnBZa+JC5g6rxoFQCg/1vNuYcvjy77edePZzIEsRmvw==", + "dependencies": { + "MonoMod.RuntimeDetour": "21.12.13.1" + } + }, + "Mono.Cecil": { + "type": "Transitive", + "resolved": "0.11.4", + "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ==" + }, + "MonoMod.RuntimeDetour": { + "type": "Transitive", + "resolved": "21.12.13.1", + "contentHash": "65mB+bHjT6UCGCgO+/pYhpuGPf96rQ1Whwkut/x7cqVIW0DTndDFyWc/3bngzhnY/Y6IYtBMlXsU2ATq+CxpHg==", + "dependencies": { + "Mono.Cecil": "0.11.4", + "MonoMod.Utils": "21.12.13.1" + } + }, + "MonoMod.Utils": { + "type": "Transitive", + "resolved": "21.12.13.1", + "contentHash": "/H+0RMWqx/D1/fSuY5jhY6GFvqhdYdlnI7J3IfL8P6y4nJkoZDxqts6+RxWWOz4pbnJdWnxSjS8XG+Lq6rUi7w==", + "dependencies": { + "Mono.Cecil": "0.11.4" + } + } + } + } +} \ No newline at end of file