Merge pull request #4 from jsebold666/dev_dust765_to_main

Dev dust765 to main
dust765 · May 31, 2024 · 87cbd82 · 87cbd82
2 parents 5a7de1b + 7d57695
commit 87cbd82
Show file tree

Hide file tree

Showing 95 changed files with 2,096 additions and 1,340 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -26,21 +26,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-       os: [ macos-latest, ubuntu-latest, windows-latest ]
+       os: [ windows-latest, macos-latest, ubuntu-latest ]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Get submodules
       run: |
         git config --global url."https://".insteadOf git://
         git submodule update --init --recursive
         
-    - name: Setup .NET 7
-      uses: actions/setup-dotnet@v3
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.0.x
-        include-prerelease: true
+        dotnet-version: 8.0.x
 
     - name: Restore
       run: dotnet restore

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
diff --git a/.github/workflows/tuo-deploy.yml b/.github/workflows/tuo-deploy.yml
@@ -38,27 +38,26 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   build:
-    # if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ${{ matrix.os }}
     strategy:
       max-parallel: 1
       matrix:
-       os: [ macos-latest, ubuntu-latest, windows-latest ]
+       os: [ windows-latest, macos-latest, ubuntu-latest ]
 
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Get submodules
       run: |
         git config --global url."https://".insteadOf git://
         git submodule update --init --recursive
         
-    - name: Setup .NET 7
-      uses: actions/setup-dotnet@v3
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.0.x
-        include-prerelease: true
+        dotnet-version: 8.0.x
 
     - name: Build
       run: dotnet publish ${{ env.CUO_PROJECT_PATH }} -c Release -o ${{ env.CUO_OUTPUT_PATH }} -p:IS_DEV_BUILD=true

diff --git a/.github/workflows/tuo-dev-deploy.yml b/.github/workflows/tuo-dev-deploy.yml
@@ -43,7 +43,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-       os: [ macos-latest, ubuntu-latest, windows-latest ]
+       os: [  windows-latest, macos-latest, ubuntu-latest ]
 
     steps:
     - uses: actions/checkout@v4
@@ -55,11 +55,10 @@ jobs:
         git config --global url."https://".insteadOf git://
         git submodule update --init --recursive
         
-    - name: Setup .NET 7
-      uses: actions/setup-dotnet@v3
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.0.x
-        include-prerelease: true
+        dotnet-version: 8.0.x
 
     - name: Build
       run: dotnet publish ${{ env.CUO_PROJECT_PATH }} -c Release -o ${{ env.CUO_OUTPUT_PATH }} -p:IS_DEV_BUILD=true

diff --git a/.gitignore b/.gitignore
@@ -266,6 +266,5 @@ __pycache__/
 /.svn
 external/FNA
 external/MP3Sharp
-.external
 .gitconfig
 work/.gitconfig
diff --git a/README.md b/README.md
@@ -48,125 +48,46 @@ alt="chat on Discord"></a>
 <p align="center"><img src="https://github.com/bittiez/TazUO/assets/3859393/832c4cf3-8525-419b-ad16-3c5f7de1b80c" width="300" height="300"></p>
 
 <p align="center">
-    <a href="https://discord.gg/VdyCpjQ">
+    <a href="https://discord.gg/SqwtB5g95H">
     <img src="https://img.shields.io/discord/1087124353155608617.svg?logo=discord"
     alt="chat on Discord"></a>
 </p>
-------------------------------------------------------------------
-
-
-Release: [![Release](https://github.com/bittiez/TazUO/actions/workflows/build-test.yml/badge.svg?branch=main)](https://github.com/bittiez/TazUO/actions/workflows/build-test.yml)  Dev: [![Dev](https://github.com/bittiez/TazUO/actions/workflows/build-test.yml/badge.svg?branch=dev)](https://github.com/bittiez/TazUO/actions/workflows/build-test.yml)   
-
-
-Join TazUO's discord for ideas/support/updates -> https://discord.gg/SqwtB5g95H
-
-Check out our [wiki](../../wiki) for details on all of the changes TazUO has made for players!
-
-This version of CUO adds [grid containers](../../wiki/TazUO.Grid-Containers) and many other features to the regular CUO client
-
-    Searchable
-
-    Resizable
-
-    Scrollable
-
-    Can lock items in specific place
-
-    Quick preview for containers inside *if the client has already cached that bag*
-
-    Item scaling!
-
-[Cool down bars](../../wiki/TazUO.Cooldown-bars)
-
-[Follow mode improvements](../../wiki/TazUO.Follow-mode)
-
-[Improved journal](../../wiki/TazUO.Journal)
-
-[Nameplate healthbars](../../wiki/TazUO.Nameplate-Healthbars)
-
-And others in our [wiki](../../wiki)
-
-![Cooldown](https://user-images.githubusercontent.com/3859393/227056224-ef1c6958-fff5-4698-a21a-c63c5814877c.gif)
-![SlottedInv](https://user-images.githubusercontent.com/3859393/226514464-32919a68-ebad-4ec0-8bcf-8614a5055f7d.gif)
-![Grid Previe](https://user-images.githubusercontent.com/3859393/222873187-c88ad321-8b19-4cfd-9617-7e23b2443b6a.gif)
-![image](https://user-images.githubusercontent.com/3859393/222975241-319e5fa6-2c1e-441d-97e6-b04a5e1f6f3b.png)
-![Journal](https://user-images.githubusercontent.com/3859393/222942915-e31d26aa-e9a7-41df-9c99-570bcc00d1fb.gif)
-![image](https://user-images.githubusercontent.com/3859393/225168130-5ce83950-853d-43ce-9583-65ec4b0ae9d6.png)
-![image](https://user-images.githubusercontent.com/3859393/225307385-c8e8014f-9b84-4fe4-a2cd-f33fbeee9563.png)
-![image](https://user-images.githubusercontent.com/3859393/226114408-28c6556d-6ba8-43c7-bf1a-079342aaeacd.png)
-![image](https://user-images.githubusercontent.com/3859393/226114417-e68b1653-f719-49b3-b799-0beb07e0a211.png)
-
-
-# Original CUO Readme:
-------------------------------------------------------------------
-
-An open source implementation of the Ultima Online Classic Client.
-
-Individuals/hobbyists: support continued maintenance and development via the monthly Patreon:
-<br>&nbsp;&nbsp;[![Patreon](https://raw.githubusercontent.com/wiki/ocornut/imgui/web/patreon_02.png)](http://www.patreon.com/classicuo)
-
-Individuals/hobbyists: support continued maintenance and development via PayPal:
-<br>&nbsp;&nbsp;[![PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9ZWJBY6MS99D8)
-
-<a href="https://discord.gg/VdyCpjQ">
-<img src="https://img.shields.io/discord/458277173208547350.svg?logo=discord"
-alt="chat on Discord"></a>
-
-[![GitHub Actions Status](https://github.com/ClassicUO/ClassicUO/workflows/Build-Test/badge.svg)](https://github.com/ClassicUO/ClassicUO/actions)
-[![GitHub Actions Status](https://github.com/ClassicUO/ClassicUO/workflows/Deploy/badge.svg)](https://github.com/ClassicUO/ClassicUO/actions)
-
-# Introduction
-ClassicUO is an open source implementation of the Ultima Online Classic Client. This client is intended to emulate all standard client versions and is primarily tested against Ultima Online free shards.
-
-The client is currently under heavy development but is functional. The code is based on the [FNA-XNA](https://fna-xna.github.io/) framework. C# is chosen because there is a large community of developers working on Ultima Online server emulators in C#, because FNA-XNA exists and seems reasonably suitable for creating this type of game.
-
-![screenshot_2020-07-06_12-29-02](https://user-images.githubusercontent.com/20810422/208747312-04f6782f-3dc8-4951-b0a0-73d2305bbfca.png)
 
+***
 
-ClassicUO is natively cross platform and supports:
-* Browser [Chrome]
-* Windows [DirectX 11, OpenGL, Vulkan]
-* Linux   [OpenGL, Vulkan]
-* macOS   [Metal, OpenGL, MoltenVK]
 
-# Download & Play!
-| Platform | Link |
-| --- | --- |
-| Browser | [Play!](https://play.classicuo.org) |
-| Windows x64 | [Download](https://www.classicuo.eu/launcher/win-x64/ClassicUOLauncher-win-x64-release.zip) |
-| Linux x64 | [Download](https://www.classicuo.eu/launcher/linux-x64/ClassicUOLauncher-linux-x64-release.zip) |
-| macOS | [Download](https://www.classicuo.eu/launcher/osx/ClassicUOLauncher-osx-x64-release.zip) |
-
-Or visit the [ClassicUO Website](https://www.classicuo.eu/)
-
-# How to build the project
-
-Clone repository with:
-```
-git config --global url."https://".insteadOf git://
-git clone --recursive https://github.com/ClassicUO/ClassicUO.git
-```
-
-Build the project:
-```
-dotnet build -c Release
-```
-
-# Contribute
-Everyone is welcome to contribute! The GitHub issues and project tracker are kept up to date with tasks that need work.
-
-# Legal
-The code itself has been written using the following projects as a reference:
-
-* [OrionUO](https://github.com/hotride/orionuo)
-* [Razor](https://github.com/msturgill/razor)
-* [UltimaXNA](https://github.com/ZaneDubya/UltimaXNA)
-* [ServUO](https://github.com/servuo/servuo)
-
-Backend:
-* [FNA](https://github.com/FNA-XNA/FNA)
-
-This work is released under the BSD 4 license. This project does not distribute any copyrighted game assets. In order to run this client you'll need to legally obtain a copy of the Ultima Online Classic Client.
-Using a custom client to connect to official UO servers is strictly forbidden. We do not assume any responsibility of the usage of this client.
+Release: [![Release](https://github.com/bittiez/TazUO/actions/workflows/build-test.yml/badge.svg?branch=main)](https://github.com/bittiez/TazUO/actions/workflows/build-test.yml)  Dev: [![Dev](https://github.com/bittiez/TazUO/actions/workflows/build-test.yml/badge.svg?branch=dev)](https://github.com/bittiez/TazUO/actions/workflows/build-test.yml)   
 
-Ultima Online(R) © 2022 Electronic Arts Inc. All Rights Reserved.
+# What is TazUO?
+**TazUO** was originally a fork from ClassicUO with the mindset of adding features requested by users to improve QOL. **TazUO** has since moved away from ClassicUO, we will keep an eye on ClassicUO updates and incorporate changes or fixes as they have a wider user base that provides bug reports, but **TazUO** will no longer be merging all changes from ClassicUO.
+
+# TazUO features
+Check out our [wiki](../../wiki) for details on all of the changes TazUO has made for players!  
+
+***Most*** features can be disabled if you don't want to use said feature.  
+
+- [Launcher](../../wiki/TazUO.Updater-Launcher) - Managing profiles for multiple accounts/servers
+- [Grid containers](../../wiki/TazUO.Grid-Containers) - Easily find and move items with out fully customizable grid containers
+- [Journal](../../wiki/TazUO.Journal) - Vastly improved journal for readability and organization
+- [Alternative paperdoll](../../wiki/TazUO.Alternate-Paperdoll) - A new flavor a your paperdoll
+- [Improved buff bar](../../wiki/TazUO.Buff-Bars)
+- [Client commands](../../wiki/TazUO.Commands) - Several commands have been added for various features
+- [Controller support](../../wiki/TazUO.Controller-Support) - That's right, play with your controller!
+- [Cooldown bars](../../wiki/TazUO.Cooldown-bars) - Customizable cooldown bars
+- [Grid Highlighting](../../wiki/TazUO.Grid-highlighting-based-on-item-properties) - Grid highlighting of items that have specific properties, easier looting!
+- [Tooltip overrides](../../wiki/TazUO.Tooltip-Override) - Customize and override any text in tooltips!
+- [Custom fonts](../../wiki/TazUO.TTF-Fonts) - BYOF, Bring your own fonts for better readability.
+
+There are ***many*** more features to check out in our [wiki](../../wiki) or in game, this list is just a sample!
+
+
+# Screenshots
+![Cooldown](https://user-images.githubusercontent.com/3859393/227056224-ef1c6958-fff5-4698-a21a-c63c5814877c.gif)  
+![SlottedInv](https://user-images.githubusercontent.com/3859393/226514464-32919a68-ebad-4ec0-8bcf-8614a5055f7d.gif)  
+![Grid Previe](https://user-images.githubusercontent.com/3859393/222873187-c88ad321-8b19-4cfd-9617-7e23b2443b6a.gif)  
+![image](https://user-images.githubusercontent.com/3859393/222975241-319e5fa6-2c1e-441d-97e6-b04a5e1f6f3b.png)  
+![Journal](https://user-images.githubusercontent.com/3859393/222942915-e31d26aa-e9a7-41df-9c99-570bcc00d1fb.gif)  
+![image](https://user-images.githubusercontent.com/3859393/225168130-5ce83950-853d-43ce-9583-65ec4b0ae9d6.png)  
+![image](https://user-images.githubusercontent.com/3859393/225307385-c8e8014f-9b84-4fe4-a2cd-f33fbeee9563.png)  
+![image](https://user-images.githubusercontent.com/3859393/226114408-28c6556d-6ba8-43c7-bf1a-079342aaeacd.png)  
+![image](https://user-images.githubusercontent.com/3859393/226114417-e68b1653-f719-49b3-b799-0beb07e0a211.png)  
diff --git a/external/FontStashSharp/src/FontStashSharp/RichText/RichTextLayout.cs b/external/FontStashSharp/src/FontStashSharp/RichText/RichTextLayout.cs
@@ -224,7 +224,7 @@ private void Update()
             {
                 _size = _layoutBuilder.Layout(Text, Font, Width);
             }
-            catch (System.Exception ex)
+            catch
             {
             }
 
@@ -249,7 +249,7 @@ public Point Measure(int? width)
                 result = _layoutBuilder.Layout(Text, Font, width, true);
                 _measures[key] = result;
             }
-            catch (System.Exception ex)
+            catch
             {
             }