Merge branch 'main' of https://github.com/data-bomb/Silica

.github/workflows/ci-pullrequest → .github/workflows/ci-pullrequest.yml

@@ -5,7 +5,7 @@ name: Eval-PR
 
 on:
   pull_request:
-    branches: [ "main" ]
+    types: [opened, reopened]
 
 env:
   BUILD_TYPE: Release

.github/workflows/cicd-push.yml

@@ -1,7 +1,7 @@
 # This workflow will build a .NET project
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
 
-name: .NET
+name: CI-CD-Pipeline
 
 on:
   push:

.github/workflows/codeql.yml

@@ -0,0 +1,84 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+#  schedule:
+#    - cron: '18 14 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v3
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

README.md

@@ -47,7 +47,13 @@
 9. Update the command line options for Silica Dedicated Server to include `--melonloader.hideconsole --melonloader.disablestartscreen` (e.g., in Steam, right-click the Silica Dedicated Server Tool from the Steam Library and put these in the Launch Options)
 10. Launch Silica Dedicated Server
 
-For Dedicated Server hosts who wish to have an official server license, note that mods are not currently supported as mods may negatively impact performance. The only exception to this is the GamePriority mod.
+## Modding and License Considerations
+Note that this is not legal advice and databomb is not a lawyer. If you do have concerns then you should consult the appropriate person before running server mods.
+| Server Type | Considerations |
+| ----------- | ----------------------------------------------------------------- |
+| Listen Server | Although no game files are modified, running mods on a listen server might be construed as modifying the game, which is not expressly permitted by the game's EULA. Depending on relevant local laws, this may be a concern. |
+| Dedicated Server | There is no EULA on the server tool, so installing and running mods of the dedicated server tool is acceptable. |
+| Licensed Dedicated Server | See A2.3 General Policy guidelines in the Silica Hosting Discord: <br> `A2.3 – Game Mods: Licensed servers are permitted to run modded game modes; however, it is important for license holders and their server admin teams to ensure that the server's performance meets the standards set for a server license. If the modded game mode negatively impacts the server's performance, it may be necessary to remove it. Failure to maintain the required performance standards may result in the revocation of the server license.` |
 
 Kind suggestion to ensure that the server name reflects that there are mods so players can choose between mods and a vanilla game experience.
 

Si_Logging/Si_Logging.csproj

@@ -1,4 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\include\common.csproj" /> 
-  <Import Project="..\include\net6.csproj" Condition="'$(TargetFramework)' == 'net6.0'"/> 
-</Project>
+  <Import Project="..\include\common.csproj" />
+  <Import Project="..\include\net6.csproj" Condition="'$(TargetFramework)' == 'net6.0'"/>
+</Project>

Si_Mapcycle/Si_Mapcycle.csproj

@@ -1,4 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\include\common.csproj" /> 
-  <Import Project="..\include\net6.csproj" Condition="'$(TargetFramework)' == 'net6.0'"/> 
-</Project>
+  <Import Project="..\include\common.csproj" />
+  <Import Project="..\include\net6.csproj" Condition="'$(TargetFramework)' == 'net6.0'"/>
+</Project>