Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
6f51f3a
No error for build
louis1706 Jan 21, 2025
cf4c725
Fix Exiled
louis1706 Jan 21, 2025
187b229
Fix RoundEnding
louis1706 Jan 22, 2025
e20b517
Now is fucking separated by default
louis1706 Jan 22, 2025
1554ee4
CustomSubtitles
louis1706 Jan 22, 2025
b567d66
Missing IsCustomAnnouncement
louis1706 Jan 22, 2025
bd60c80
Fix 3 patch & removal of CustomHealthStat
louis1706 Jan 22, 2025
b9da17f
Fix UsingAndCancellingItemUse
louis1706 Jan 22, 2025
a4ba5f7
Fix TogglingFlashlight
louis1706 Jan 22, 2025
e5d1021
La Flemme ?
louis1706 Jan 22, 2025
8945d11
La flemme 2
louis1706 Jan 22, 2025
34d4fdd
Fix ReservedSlotPatch
louis1706 Jan 22, 2025
a7ae2cb
Fix PickingUpItem(PickingUpAmmo)
louis1706 Jan 22, 2025
0bf8480
Fix Hurt event
louis1706 Jan 22, 2025
488716a
Fix FlippingCoin & EscapingPocketDimension
louis1706 Jan 22, 2025
15703b1
Fix FailingEscapePocketDimension
louis1706 Jan 22, 2025
3c4ec86
EscapingAndEscaped fix patch
louis1706 Jan 22, 2025
d3d5f59
Fix UpgradingPlayer patch
louis1706 Jan 22, 2025
2399186
Fix BeingObserved
louis1706 Jan 22, 2025
d74aa3b
Fix PlacingTantrum
louis1706 Jan 22, 2025
df6bc6d
Fix FinishingRecall
louis1706 Jan 22, 2025
d768ee1
ChangingCamera (Not working)
louis1706 Jan 22, 2025
fa0fce3
putting again the event than i was lazzy to fix
louis1706 Jan 22, 2025
1fe7d02
Rework InteractingDoor Patch
louis1706 Jan 22, 2025
1eb9618
Remove useless using and warning disable
louis1706 Jan 22, 2025
de33705
OUPS
louis1706 Jan 22, 2025
14c4ea0
if stupidity was me it's here (i am stupid)
louis1706 Jan 22, 2025
880d52b
Fixing Noclip with breakingchange
louis1706 Jan 22, 2025
275c97c
CustomHumeShieldStat
louis1706 Jan 22, 2025
41a0994
Fix InteractingGenerator
louis1706 Jan 24, 2025
0638834
Fix ChangingCamera
louis1706 Jan 24, 2025
f539322
Not finish
louis1706 Jan 27, 2025
f7788a6
InteractingDoor swap CanInteract & IsAllowed back to normal
louis1706 Jan 27, 2025
3993cfe
Player::Gravity
louis1706 Jan 28, 2025
36d94b4
Gravity in wrong place
louis1706 Jan 28, 2025
88fa6af
IHumeShieldRole for Human
louis1706 Jan 28, 2025
d23c75f
Fix BlastDoors & add OpenBlastDoor
louis1706 Jan 28, 2025
b6f6ef7
Fix SpawningRagdoll Scale & missing argument when modify
louis1706 Jan 28, 2025
9d270a5
Now fix in LabAPI only
louis1706 Jan 28, 2025
c15bcc2
we will keep the funny Ragdoll scale
louis1706 Jan 28, 2025
6560885
Merge branch 'dev' into LabAPIUpdate
louis1706 Feb 10, 2025
ea240b8
Fix Merge & Split Command
louis1706 Feb 11, 2025
6a362ac
new workflow for LabAPI
louis1706 Feb 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions .github/workflows/labapi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: Exiled Dev CI

on:
push:
branches:
- LabAPI
pull_request:
branches:
- LabAPI
workflow_dispatch:

defaults:
run:
working-directory: ./EXILED

env:
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/LabAPI.zip
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe

jobs:

build:

runs-on: windows-latest
# Prevent double running for push & pull_request events from the main repo
if: github.event_name != 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name

steps:

- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4.0.1

- name: Setup Nuget
uses: nuget/setup-nuget@v2

- uses: actions/checkout@v4.1.7

- name: Get references
shell: pwsh
run: |
Invoke-WebRequest -Uri ${{ env.EXILED_REFERENCES_URL }} -OutFile ${{ github.workspace }}/EXILED/References.zip
Expand-Archive -Path References.zip -DestinationPath ${{ env.EXILED_REFERENCES_PATH }}

- name: Build
env:
EXILED_REFERENCES: ${{ env.EXILED_REFERENCES_PATH }}
shell: pwsh
run: |
./build.ps1 -BuildNuGet
$File = (Get-ChildItem -Path . -Include 'ExMod.Exiled.*.nupkg' -Recurse).Name
Out-File -FilePath ${{ github.env }} -InputObject "PackageFile=$File" -Encoding utf-8 -Append

- name: Upload nuget package
uses: actions/upload-artifact@v4
with:
name: ${{ env.PackageFile }}
path: EXILED/${{ env.PackageFile }}

- name: Get references
shell: pwsh
run: |
Invoke-WebRequest -Uri ${{ env.EXILED_DLL_ARCHIVER_URL }} -OutFile ${{ github.workspace }}/EXILED/EXILED-DLL-Archiver.exe

- name: Packaging results as tar.gz
shell: pwsh
run: ./packaging.ps1

- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: Build Result
path: EXILED/bin/Release/Exiled.tar.gz

2 changes: 1 addition & 1 deletion EXILED/Exiled.API/Exiled.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
</Reference>
<Reference Include="Assembly-CSharp-firstpass" HintPath="$(EXILED_REFERENCES)\Assembly-CSharp-firstpass.dll" Private="false" />
<Reference Include="CommandSystem.Core" HintPath="$(EXILED_REFERENCES)\CommandSystem.Core.dll" Private="false" />
<Reference Include="LabApi" HintPath="$(EXILED_REFERENCES)\LabApi.dll" Private="false" />
<Reference Include="Pooling" HintPath="$(EXILED_REFERENCES)\Pooling.dll" Private="false" />
<Reference Include="Mirror" HintPath="$(EXILED_REFERENCES)\Mirror.dll" Private="false" />
<Reference Include="NorthwoodLib" HintPath="$(EXILED_REFERENCES)\NorthwoodLib.dll" Private="false" />
<Reference Include="PluginAPI" HintPath="$(EXILED_REFERENCES)\PluginAPI.dll" Private="false" />
<Reference Include="Unity.TextMeshPro" HintPath="$(EXILED_REFERENCES)\Unity.TextMeshPro.dll" Private="false" />
<Reference Include="UnityEngine" HintPath="$(EXILED_REFERENCES)\UnityEngine.dll" Private="false" />
<Reference Include="UnityEngine.CoreModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll" Private="false" />
Expand Down
4 changes: 2 additions & 2 deletions EXILED/Exiled.API/Extensions/UserGroupExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static bool EqualsTo(this UserGroup @this, UserGroup other)
/// </summary>
/// <param name="this">The <see cref="UserGroup"/>.</param>
/// <returns>The key of that group, or <see langword="null"/> if not found.</returns>
public static string GetKey(this UserGroup @this) => Server.PermissionsHandler._groups
public static string GetKey(this UserGroup @this) => Server.PermissionsHandler.Groups
.FirstOrDefault(pair => pair.Value.EqualsTo(@this)).Key;

/// <summary>
Expand All @@ -47,7 +47,7 @@ public static string GetKey(this UserGroup @this) => Server.PermissionsHandler._
/// <returns>The value of that group, or <see langword="null"/> if not found.</returns>
public static UserGroup GetValue(string groupName)
{
ServerStatic.GetPermissionsHandler().GetAllGroups().TryGetValue(groupName, out UserGroup userGroup);
ServerStatic.PermissionsHandler.GetAllGroups().TryGetValue(groupName, out UserGroup userGroup);
return userGroup;
}
}
Expand Down
4 changes: 2 additions & 2 deletions EXILED/Exiled.API/Features/Camera.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ internal Camera(Scp079Camera camera079)
/// </summary>
public Quaternion Rotation
{
get => Base._cameraAnchor.rotation;
set => Base._cameraAnchor.rotation = value;
get => Base.CameraAnchor.rotation;
set => Base.CameraAnchor.rotation = value;
}

/// <summary>
Expand Down
26 changes: 0 additions & 26 deletions EXILED/Exiled.API/Features/CustomHealthStat.cs

This file was deleted.

16 changes: 4 additions & 12 deletions EXILED/Exiled.API/Features/CustomStats/CustomHumeShieldStat.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
// <copyright file="CustomHumeShieldStat.cs" company="ExMod Team">
// Copyright (c) ExMod Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
Expand All @@ -18,25 +18,17 @@ namespace Exiled.API.Features.CustomStats
/// </summary>
public class CustomHumeShieldStat : HumeShieldStat
{
/// <inheritdoc />
public override float MaxValue => CustomMaxValue == -1 ? base.MaxValue : CustomMaxValue;

/// <summary>
/// Gets or sets the multiplier for gaining HumeShield.
/// </summary>
public float ShieldRegenerationMultiplier { get; set; } = 1;

/// <summary>
/// Gets or sets the maximum amount of HumeShield the player can have.
/// </summary>
public float CustomMaxValue { get; set; } = -1;

private float ShieldRegeneration => TryGetHsModule(out HumeShieldModuleBase controller) ? controller.HsRegeneration * ShieldRegenerationMultiplier : 0;

/// <inheritdoc/>
public override void Update()
{
if (MaxValue == -1 && ShieldRegenerationMultiplier is 1)
if (ShieldRegenerationMultiplier is 1)
{
base.Update();
return;
Expand All @@ -45,15 +37,15 @@ public override void Update()
if (!NetworkServer.active)
return;

if (_valueDirty)
if (ValueDirty)
{
new SyncedStatMessages.StatMessage()
{
Stat = this,
SyncedValue = CurValue,
}.SendToHubsConditionally(CanReceive);
_lastSent = CurValue;
_valueDirty = false;
ValueDirty = false;
}

if (ShieldRegeneration == 0)
Expand Down
16 changes: 8 additions & 8 deletions EXILED/Exiled.API/Features/Doors/CheckpointDoor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,35 +44,35 @@ internal CheckpointDoor(Interactables.Interobjects.CheckpointDoor door, List<Roo
/// </summary>
public Interactables.Interobjects.CheckpointDoor.CheckpointSequenceStage CurrentStage
{
get => Base._currentSequence;
set => Base._currentSequence = value;
get => Base.CurrentSequence;
set => Base.CurrentSequence = value;
}

/// <summary>
/// Gets or sets a time in seconds for main timer.
/// </summary>
public float MainTimer
{
get => Base._mainTimer;
set => Base._mainTimer = value;
get => Base.MainTimer;
set => Base.MainTimer = value;
}

/// <summary>
/// Gets or sets time before doors close.
/// </summary>
public float WaitTime
{
get => Base._waitTime;
set => Base._waitTime = value;
get => Base.WaitTime;
set => Base.WaitTime = value;
}

/// <summary>
/// Gets or sets time in seconds when warning will be shown.
/// </summary>
public float WarningTime
{
get => Base._warningTime;
set => Base._warningTime = value;
get => Base.WarningTime;
set => Base.WarningTime = value;
}

/// <inheritdoc/>
Expand Down
4 changes: 2 additions & 2 deletions EXILED/Exiled.API/Features/Hazards/TemporaryHazard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public bool IsDestroyed
/// </summary>
public float Duration
{
get => Base._elapsed;
set => Base._elapsed = value;
get => Base.Elapsed;
set => Base.Elapsed = value;
}

/// <summary>
Expand Down
4 changes: 3 additions & 1 deletion EXILED/Exiled.API/Features/Paths.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ namespace Exiled.API.Features
using System.IO;
using System.Linq;

using LabApi.Loader;

/// <summary>
/// A set of useful paths.
/// </summary>
Expand Down Expand Up @@ -106,7 +108,7 @@ public static void Reload(string rootDirectory = null)
Dependencies = Path.Combine(Plugins, "dependencies");
Configs = Path.Combine(Exiled, "Configs");
IndividualConfigs = Path.Combine(Configs, "Plugins");
LoaderConfig = PluginAPI.Loader.AssemblyLoader.InstalledPlugins.FirstOrDefault(x => x.PluginName == "Exiled Loader")?.MainConfigPath;
LoaderConfig = LabApi.Loader.PluginLoader.EnabledPlugins.FirstOrDefault(x => x.Name == "Exiled Loader")?.GetConfigPath("Exiled Loader");
Config = Path.Combine(Configs, $"{Server.Port}-config.yml");
BackupConfig = Path.Combine(Configs, $"{Server.Port}-config.yml.old");
IndividualTranslations = Path.Combine(Configs, "Translations");
Expand Down
Loading
Loading