Skip to content

Commit

Permalink
Added CrimsonBanned messages.json +semver:minor
Browse files Browse the repository at this point in the history
  • Loading branch information
SkyTech6 committed Dec 7, 2024
1 parent 874eebe commit 244c725
Show file tree
Hide file tree
Showing 26 changed files with 377 additions and 18 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,3 @@ jobs:
fail_on_unmatched_files: true
prerelease: true
tag_name: v${{ env.GitVersion_SemVer }}

- uses: Swatinem/rust-cache@v2
with:
workspaces: "src-tauri"

- uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
`latest`
- Added a new Mod: CrimsonBanned
- Support for CrimsonBanned's messages.json
- Icons for JSON Rising

`0.1.14`
- changed how CrimsonChatFilter displayed the filter list
- Updates to the Index page
- New ModCard component
Expand Down
Binary file modified src-tauri/icons/128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src-tauri/icons/128x128@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src-tauri/icons/32x32.ico
Binary file not shown.
Binary file modified src-tauri/icons/32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src-tauri/icons/Square107x107Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/Square142x142Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/Square150x150Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/Square284x284Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/Square30x30Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/Square310x310Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/Square44x44Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/Square71x71Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/Square89x89Logo.png
Binary file not shown.
Binary file removed src-tauri/icons/StoreLogo.png
Binary file not shown.
Binary file removed src-tauri/icons/icon.icns
Binary file not shown.
Binary file removed src-tauri/icons/icon.ico
Binary file not shown.
Binary file removed src-tauri/icons/icon.png
Binary file not shown.
9 changes: 4 additions & 5 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "jsonrising",
"productName": "JSON Rising",
"version": "0.0.0",
"identifier": "com.jsonrising.app",
"build": {
Expand All @@ -14,8 +14,8 @@
"windows": [
{
"title": "JSON Rising",
"width": 800,
"height": 600
"width": 1920,
"height": 1080
}
],
"security": {
Expand All @@ -32,8 +32,7 @@
"icons/32x32.png",
"icons/128x128.png",
"icons/128x128@2x.png",
"icons/icon.icns",
"icons/icon.ico"
"icons/32x32.ico"
]
}
}
5 changes: 4 additions & 1 deletion src/Components/ModCard.razor
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
@code {
private async Task OpenThunderstoreUrl()
{
await JSRuntime.InvokeVoidAsync("open", Mod.ThunderstoreUrl, "_blank");
if (!string.IsNullOrEmpty(Mod.ThunderstoreUrl))
{
await JSRuntime.InvokeVoidAsync("window.__TAURI__.shell.open", Mod.ThunderstoreUrl);
}
}

private void NavigateToJson()
Expand Down
14 changes: 14 additions & 0 deletions src/JSONTemplates/Banned/messages.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"Key": "CheckHeader",
"Value": "\n{player}\u0027s ({id}) Bans:"
},
{
"Key": "CheckBanLine",
"Value": "\n{type} Ban\nIssued: {issued}\nRemaining: {remainder}\nReason: {reason}"
},
{
"Key": "ListBan",
"Value": "\n{player} ({id}) - {remainder}"
}
]
14 changes: 14 additions & 0 deletions src/Models/MessagePair.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace JSONRising.Models
{
public class MessagePair
{
public string Key { get; set; }
public string Value { get; set; }

public MessagePair(string key, string value)
{
Key = key;
Value = value;
}
}
}
Loading

0 comments on commit 244c725

Please sign in to comment.