Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit affd487

Browse files
committed
Make it work on stable
1 parent b655d6c commit affd487

File tree

10 files changed

+21
-15
lines changed

10 files changed

+21
-15
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
//49
1+
//50
22
//
33
// This code was generated by a tool. Any changes made manually will be lost
44
// the next time this code is regenerated.
55
//
66

77
using System.Reflection;
88

9-
[assembly: AssemblyFileVersion("1.13.7.49")]
10-
[assembly: AssemblyVersion("1.13.7.49")]
9+
[assembly: AssemblyFileVersion("1.13.7.50")]
10+
[assembly: AssemblyVersion("1.13.7.50")]

EssentialsPlugin/EntityManagers/EntityManagement.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
using VRage.Game;
2323
using VRage.Game.Entity;
2424
using VRage.Game.ModAPI;
25-
using IMyBeacon = Sandbox.ModAPI.IMyBeacon;
26-
using IMyMedicalRoom = SpaceEngineers.Game.ModAPI.IMyMedicalRoom;
2725
using IMyProductionBlock = Sandbox.ModAPI.IMyProductionBlock;
28-
using IMyRadioAntenna = Sandbox.ModAPI.IMyRadioAntenna;
2926

3027
public class EntityManagement
3128
{

EssentialsPlugin/Essentials.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class Essentials : IPlugin, IChatEventHandler, IPlayerEventHandler, ICube
5555

5656
#region Properties
5757

58-
public static bool StableBuild = false;
58+
public static bool StableBuild = true;
5959

6060
public static string PluginPath
6161
{
@@ -1145,6 +1145,7 @@ public float AtmosphericCargoShipSpawnTime {
11451145
}
11461146
}
11471147

1148+
/*
11481149
[Category("Programmable Block Blacklist")]
11491150
[Description("Types and members in this list will be unavailable to all programmable blocks. Ask on the KSH forum if you're unsure how to use this!!")]
11501151
[Browsable(true)]
@@ -1160,7 +1161,7 @@ public MTObservableCollection<BlacklistItem> BlacklistItems
11601161
PluginSettings.Instance.BlacklistItems = value;
11611162
}
11621163
}
1163-
1164+
*/
11641165
/*
11651166
[Category("Game Modes")]
11661167
[Description("Conquest Game Mode - This mode tracks asteroid owners by counting owned blocks near an asteroid to determine the owner. Includes a leaderboard")]
@@ -1337,7 +1338,7 @@ private void DoInit( string path )
13371338

13381339
MyAPIGateway.Multiplayer.RegisterMessageHandler(9005, Communication.ReceiveMessageParts);
13391340
MyAPIGateway.Multiplayer.RegisterMessageHandler( 9007, Communication.HandleAddConcealExempt );
1340-
BlacklistManager.Instance.UpdateBlacklist();
1341+
//BlacklistManager.Instance.UpdateBlacklist();
13411342
Log.Info( "Plugin '{0}' initialized. (Version: {1} ID: {2})", Name, Version, Id );
13421343
}
13431344

EssentialsPlugin/EssentialsPlugin.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
<DesignTime>True</DesignTime>
179179
<DependentUpon>Resources.resx</DependentUpon>
180180
</Compile>
181+
<Compile Include="Settings\SettingsBlacklistItem.cs" />
181182
<Compile Include="Settings\SettingsBlockEnforcementItem.cs" />
182183
<Compile Include="Settings\SettingsCleanupNotificationItem.cs" />
183184
<Compile Include="Settings\SettingsCleanupTriggerItem.cs" />
@@ -214,6 +215,7 @@
214215
<Compile Include="Utility\Player.cs" />
215216
<Compile Include="Utility\Utility.cs" />
216217
<Compile Include="Utility\Waypoints.cs" />
218+
<Compile Include="Utility\BlacklistManager.cs" />
217219
<Compile Include="Utility\Wrapper.cs" />
218220
</ItemGroup>
219221
<ItemGroup>
@@ -299,6 +301,9 @@
299301
<SpecificVersion>False</SpecificVersion>
300302
<HintPath>..\..\SEServerExtender\GameLibraries\VRage.Math.dll</HintPath>
301303
</Reference>
304+
<Reference Include="VRage.Scripting">
305+
<HintPath>..\..\SEServerExtender\GameLibraries\VRage.Scripting.dll</HintPath>
306+
</Reference>
302307
<Reference Include="WindowsBase" />
303308
</ItemGroup>
304309
<ItemGroup>

EssentialsPlugin/ProcessHandlers/ProcessBlockEnforcement.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using VRage.Game.ModAPI;
1313
using VRage.ModAPI;
1414
using VRageMath;
15-
using IMyGridTerminalSystem = Sandbox.ModAPI.IMyGridTerminalSystem;
1615
using IMyTerminalBlock = Sandbox.ModAPI.Ingame.IMyTerminalBlock;
1716

1817
class ProcessBlockEnforcement : ProcessHandlerBase

EssentialsPlugin/Settings/PluginSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ public MTObservableCollection<BlacklistItem> BlacklistItems
10321032
set
10331033
{
10341034
_blacklistItems = value;
1035-
BlacklistManager.Instance.UpdateBlacklist();
1035+
//BlacklistManager.Instance.UpdateBlacklist();
10361036
Save();
10371037
}
10381038
}
@@ -1115,7 +1115,7 @@ public PluginSettings()
11151115

11161116
_blacklistItems = new MTObservableCollection<BlacklistItem>();
11171117
_blacklistItems.CollectionChanged += ItemsCollectionChanged;
1118-
_blacklistItems.CollectionChanged += BlacklistManager.Instance._blacklistItems_CollectionChanged;
1118+
//_blacklistItems.CollectionChanged += BlacklistManager.Instance._blacklistItems_CollectionChanged;
11191119

11201120
_atmosphericCargoShipsEnabled = false;
11211121
_atmosphericCargoShipSpawnTime = 10.0f;

EssentialsPlugin/Settings/SettingsBlacklistItem.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public string Type
1313
set
1414
{
1515
_type = value;
16+
/*
1617
switch ( BlacklistManager.Instance.ValidateBlacklistItem( this ) )
1718
{
1819
case BlacklistManager.BlacklistVerificationEnum.InvalidType:
@@ -22,8 +23,9 @@ public string Type
2223
throw new ArgumentException( $"{_member} is not a valid member of {_type}!" );
2324
2425
case BlacklistManager.BlacklistVerificationEnum.NoType:
25-
throw new ArgumentException( "You mus give a type if you specify a member!" );
26+
throw new ArgumentException( "You mus give a type if you specify a member!" );
2627
}
28+
*/
2729
}
2830
}
2931

@@ -34,6 +36,7 @@ public string Member
3436
set
3537
{
3638
_member = value;
39+
/*
3740
switch (BlacklistManager.Instance.ValidateBlacklistItem(this))
3841
{
3942
case BlacklistManager.BlacklistVerificationEnum.InvalidType:
@@ -45,6 +48,7 @@ public string Member
4548
case BlacklistManager.BlacklistVerificationEnum.NoType:
4649
throw new ArgumentException("You mus give a type if you specify a member!");
4750
}
51+
*/
4852
}
4953
}
5054
}

EssentialsPlugin/Utility/BlacklistManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
namespace EssentialsPlugin.Utility
1010
{
11+
/*
1112
using System.Collections.Specialized;
1213
using System.Reflection;
1314
using Settings;
@@ -124,4 +125,5 @@ public BlacklistVerificationEnum ValidateBlacklistItem( BlacklistItem item )
124125
return BlacklistVerificationEnum.InvalidMember;
125126
}
126127
}
128+
*/
127129
}

EssentialsPlugin/Utility/CubeGrid.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
using VRage.Game.Entity;
3333
using VRage.Game.ModAPI;
3434
using VRage.Library.Utils;
35-
using IMyBatteryBlock = Sandbox.ModAPI.IMyBatteryBlock;
3635
using IMyReactor = Sandbox.ModAPI.IMyReactor;
3736

3837
public enum RemoveGridTypes

EssentialsPlugin/Utility/DockingZone.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using VRage.Game.ModAPI;
1212
using VRage.ModAPI;
1313
using VRageMath;
14-
using IMyBeacon = Sandbox.ModAPI.IMyBeacon;
1514
using IMyTerminalBlock = Sandbox.ModAPI.IMyTerminalBlock;
1615

1716
public static class DockingZone

0 commit comments

Comments
 (0)