Skip to content

Commit

Permalink
Added the ability to download Bedrock server versions dynamically
Browse files Browse the repository at this point in the history
  • Loading branch information
@DouglasDwyer
DouglasDwyer committed Jun 25, 2020
1 parent d015e65 commit 07cc8f3
Show file tree
Hide file tree
Showing 2,383 changed files with 4,920 additions and 339,334 deletions.
Binary file modified .vs/IntegratedMinecraftServer/v16/.suo
View file
Binary file not shown.
Binary file modified ...mplate/obj/Release/netcoreapp3.1/IMS-DevelopmentKitTemplate.csprojAssemblyReference.cache
View file
Binary file not shown.
Binary file modified IMS-Distribution/latest-update.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion IMS-Distribution/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0.0
1.0.1.0
2 changes: 1 addition & 1 deletion IMS-Interface/Pages/PluginManager.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<td>
@plugin.Author
</td>
<td>
<td style="float:right">
@if (plugin.Enabled)
{
<a href="javascript:;" @onclick="x => { IMS.Instance.PluginManager.UnloadPlugin(plugin.AssemblyName); plugin.Enabled = false; }">Disable</a>
Expand Down
11 changes: 6 additions & 5 deletions IMS-Interface/Pages/ReleaseNotes.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,21 @@
<br />
<br />
<div style="max-width:500px">
<!--
<label class="header-label"><b>Features</b></label>
<ul>
<li>Added new features for debugging plugins, including the addition of the "-plugin" command line argument.</li>
</ul>
</ul>-->
<label class="header-label"><b>Bugfixes</b></label>
<ul>
<li>Made the plugin management buttons right-aligned to match the rest of the IMS GUI.</li>
<li>Fixed a bug where newly-created Java servers wouldn't start due to the inexistence of a log folder.</li>
<li>Fixed a bug where the latest version of Minecraft wasn't automatically set on startup.</li>
</ul>
<!--
<label class="header-label"><b>Maintenance</b></label>
<ul>
<li>Added logging support for the IMS update routine.</li>
</ul>-->
<li>Added proper versioning support for Minecraft: Bedrock Edition binaries.</li>
<li>Removed all Minecraft server binaries from IMS in order to be Mojang EULA-compliant.</li>
</ul>
</div>

@code {
Expand Down
6 changes: 3 additions & 3 deletions IMS-Interface/bin/Debug/netcoreapp3.1/IMS-Interface.deps.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"IMS-Interface/1.0.0": {
"dependencies": {
"Cloudcrate.AspNetCore.Blazor.Browser.Storage": "3.0.0",
"IMS-DevelopmentKit": "1.0.0",
"IMS-DevelopmentKit": "1.0.1",
"Microsoft.AspNetCore.Authorization": "3.1.3",
"Microsoft.AspNetCore.Http": "2.2.2",
"Microsoft.AspNetCore.Http.Extensions": "2.2.0",
Expand Down Expand Up @@ -1519,7 +1519,7 @@
"lib/netstandard2.0/Blazor.FileReader.dll": {}
}
},
"IMS-DevelopmentKit/1.0.0": {
"IMS-DevelopmentKit/1.0.1": {
"dependencies": {
"Microsoft.VisualBasic": "10.3.0",
"Microsoft.Windows.Compatibility": "3.1.0",
Expand Down Expand Up @@ -3942,7 +3942,7 @@
"path": "tewr.blazor.filereader/1.5.0.20109",
"hashPath": "tewr.blazor.filereader.1.5.0.20109.nupkg.sha512"
},
"IMS-DevelopmentKit/1.0.0": {
"IMS-DevelopmentKit/1.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file modified IMS-Interface/bin/Debug/netcoreapp3.1/IMS-Interface.dll
View file
Binary file not shown.
Binary file modified IMS-Interface/bin/Debug/netcoreapp3.1/IMS-Interface.pdb
View file
Binary file not shown.
Binary file modified IMS-Interface/bin/Debug/netcoreapp3.1/IMS-Library.dll
View file
Binary file not shown.
Binary file modified IMS-Interface/bin/Debug/netcoreapp3.1/IMS-Library.pdb
View file
Binary file not shown.
22 changes: 18 additions & 4 deletions IMS-Interface/bin/Debug/netcoreapp3.1/IMS-Library.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions IMS-Interface/bin/Release/netcoreapp3.1/IMS-Interface.deps.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"IMS-Interface/1.0.0": {
"dependencies": {
"Cloudcrate.AspNetCore.Blazor.Browser.Storage": "3.0.0",
"IMS-DevelopmentKit": "1.0.0",
"IMS-DevelopmentKit": "1.0.1",
"Microsoft.AspNetCore.Authorization": "3.1.3",
"Microsoft.AspNetCore.Http": "2.2.2",
"Microsoft.AspNetCore.Http.Extensions": "2.2.0",
Expand Down Expand Up @@ -1519,7 +1519,7 @@
"lib/netstandard2.0/Blazor.FileReader.dll": {}
}
},
"IMS-DevelopmentKit/1.0.0": {
"IMS-DevelopmentKit/1.0.1": {
"dependencies": {
"Microsoft.VisualBasic": "10.3.0",
"Microsoft.Windows.Compatibility": "3.1.0",
Expand Down Expand Up @@ -3942,7 +3942,7 @@
"path": "tewr.blazor.filereader/1.5.0.20109",
"hashPath": "tewr.blazor.filereader.1.5.0.20109.nupkg.sha512"
},
"IMS-DevelopmentKit/1.0.0": {
"IMS-DevelopmentKit/1.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file modified IMS-Interface/bin/Release/netcoreapp3.1/IMS-Interface.dll
View file
Binary file not shown.
Binary file modified IMS-Interface/bin/Release/netcoreapp3.1/IMS-Interface.pdb
View file
Binary file not shown.
Binary file modified IMS-Interface/bin/Release/netcoreapp3.1/IMS-Library.dll
View file
Binary file not shown.
Binary file modified IMS-Interface/bin/Release/netcoreapp3.1/IMS-Library.pdb
View file
Binary file not shown.
Binary file modified IMS-Interface/obj/Debug/netcoreapp3.1/IMS-Interface.csprojAssemblyReference.cache
View file
Binary file not shown.
Binary file modified IMS-Interface/obj/Debug/netcoreapp3.1/IMS-Interface.dll
View file
Binary file not shown.
Binary file modified IMS-Interface/obj/Debug/netcoreapp3.1/IMS-Interface.pdb
View file
Binary file not shown.
63 changes: 32 additions & 31 deletions IMS-Interface/obj/Debug/netcoreapp3.1/Razor/Pages/PluginManager.razor.g.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2226a6e616c3385951942e4b55189573b4b5465c"
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "da5ee26fbcda30a9f37cc9c8201a771d5e8dabff"
// <auto-generated/>
#pragma warning disable 1591
namespace IMS_Interface
Expand Down Expand Up @@ -280,7 +280,8 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
__builder.CloseElement();
__builder.AddMarkupContent(54, "\r\n ");
__builder.OpenElement(55, "td");
__builder.AddMarkupContent(56, "\r\n");
__builder.AddAttribute(56, "style", "float:right");
__builder.AddMarkupContent(57, "\r\n");
#nullable restore
#line 59 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
if (plugin.Enabled)
Expand All @@ -289,10 +290,10 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
#line default
#line hidden
#nullable disable
__builder.AddContent(57, " ");
__builder.OpenElement(58, "a");
__builder.AddAttribute(59, "href", "javascript:;");
__builder.AddAttribute(60, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this,
__builder.AddContent(58, " ");
__builder.OpenElement(59, "a");
__builder.AddAttribute(60, "href", "javascript:;");
__builder.AddAttribute(61, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this,
#nullable restore
#line 61 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
x => { IMS.Instance.PluginManager.UnloadPlugin(plugin.AssemblyName); plugin.Enabled = false; }
Expand All @@ -301,9 +302,9 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
#line hidden
#nullable disable
));
__builder.AddContent(61, "Disable");
__builder.AddContent(62, "Disable");
__builder.CloseElement();
__builder.AddMarkupContent(62, "\r\n");
__builder.AddMarkupContent(63, "\r\n");
#nullable restore
#line 62 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
}
Expand All @@ -313,10 +314,10 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
#line default
#line hidden
#nullable disable
__builder.AddContent(63, " ");
__builder.OpenElement(64, "a");
__builder.AddAttribute(65, "href", "javascript:;");
__builder.AddAttribute(66, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this,
__builder.AddContent(64, " ");
__builder.OpenElement(65, "a");
__builder.AddAttribute(66, "href", "javascript:;");
__builder.AddAttribute(67, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this,
#nullable restore
#line 65 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
x => { IMS.Instance.PluginManager.LoadPlugin(plugin); plugin.Enabled = true; }
Expand All @@ -325,20 +326,20 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
#line hidden
#nullable disable
));
__builder.AddContent(67, "Enable");
__builder.AddContent(68, "Enable");
__builder.CloseElement();
__builder.AddMarkupContent(68, "\r\n");
__builder.AddMarkupContent(69, "\r\n");
#nullable restore
#line 66 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
}

#line default
#line hidden
#nullable disable
__builder.AddContent(69, " | ");
__builder.OpenElement(70, "a");
__builder.AddAttribute(71, "href", "javascript:;");
__builder.AddAttribute(72, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this,
__builder.AddContent(70, " | ");
__builder.OpenElement(71, "a");
__builder.AddAttribute(72, "href", "javascript:;");
__builder.AddAttribute(73, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this,
#nullable restore
#line 67 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
x => IMS.Instance.PluginManager.DeletePlugin(plugin)
Expand All @@ -347,25 +348,25 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
#line hidden
#nullable disable
));
__builder.AddContent(73, "Remove");
__builder.AddContent(74, "Remove");
__builder.CloseElement();
__builder.AddMarkupContent(74, "\r\n ");
__builder.AddMarkupContent(75, "\r\n ");
__builder.CloseElement();
__builder.AddMarkupContent(75, "\r\n ");
__builder.AddMarkupContent(76, "\r\n ");
__builder.CloseElement();
__builder.AddMarkupContent(76, "\r\n");
__builder.AddMarkupContent(77, "\r\n");
#nullable restore
#line 70 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
}

#line default
#line hidden
#nullable disable
__builder.AddContent(77, " ");
__builder.AddContent(78, " ");
__builder.CloseElement();
__builder.AddMarkupContent(78, "\r\n ");
__builder.AddMarkupContent(79, "\r\n ");
__builder.CloseElement();
__builder.AddMarkupContent(79, "\r\n");
__builder.AddMarkupContent(80, "\r\n");
#nullable restore
#line 73 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
}
Expand All @@ -375,22 +376,22 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
#line default
#line hidden
#nullable disable
__builder.AddContent(80, " ");
__builder.AddMarkupContent(81, "<label style=\"font-weight:normal; vertical-align:middle\"><i>There currently are no known plugins.</i></label>\r\n");
__builder.AddContent(81, " ");
__builder.AddMarkupContent(82, "<label style=\"font-weight:normal; vertical-align:middle\"><i>There currently are no known plugins.</i></label>\r\n");
#nullable restore
#line 77 "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor"
}

#line default
#line hidden
#nullable disable
__builder.AddContent(82, " ");
__builder.AddContent(83, " ");
__builder.CloseElement();
__builder.AddMarkupContent(83, "\r\n ");
__builder.AddMarkupContent(84, "\r\n ");
__builder.CloseElement();
__builder.AddMarkupContent(84, "\r\n ");
__builder.AddMarkupContent(85, "\r\n ");
__builder.CloseElement();
__builder.AddMarkupContent(85, "\r\n");
__builder.AddMarkupContent(86, "\r\n");
__builder.CloseElement();
}
#pragma warning restore 1998
Expand Down
14 changes: 7 additions & 7 deletions IMS-Interface/obj/Debug/netcoreapp3.1/Razor/Pages/ReleaseNotes.razor.g.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\ReleaseNotes.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5782e719c227e84573dfca64e93371c25d19d8e0"
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\ReleaseNotes.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "e9bc17cd4d3f3fe4c98cbe8ffc26f183b1be36ec"
// <auto-generated/>
#pragma warning disable 1591
namespace IMS_Interface
Expand Down Expand Up @@ -132,16 +132,16 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
__builder.CloseElement();
__builder.AddMarkupContent(7, "\r\n<br>\r\n<br>\r\n");
__builder.AddMarkupContent(8, @"<div style=""max-width:500px"">
<label class=""header-label""><b>Features</b></label>
<ul>
<li>Added new features for debugging plugins, including the addition of the ""-plugin"" command line argument.</li>
</ul>
<label class=""header-label""><b>Bugfixes</b></label>
<ul>
<li>Fixed a bug where newly-created Java servers wouldn't start due to the inexistence of a log folder.</li>
<li>Fixed a bug where the latest version of Minecraft wasn't automatically set on startup.</li>
</ul>
<label class=""header-label""><b>Maintenance</b></label>
<ul>
<li>Added proper versioning support for Minecraft: Bedrock Edition binaries.</li>
<li>Removed all Minecraft server binaries from IMS in order to be Mojang EULA-compliant.</li>
</ul>
</div>");
}
#pragma warning restore 1998
Expand Down
6 changes: 3 additions & 3 deletions ...bj/Debug/netcoreapp3.1/Razor/Shared/Preferences/SelectServerVersionDisplayView.razor.g.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Shared\Preferences\SelectServerVersionDisplayView.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "13daed6fc5ba21f7a52d835e96722753cf91c2ba"
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Shared\Preferences\SelectServerVersionDisplayView.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "00ac09815b5f0f40266a4adb7cd66043aff0ed2f"
// <auto-generated/>
#pragma warning disable 1591
namespace IMS_Interface.Preferences
Expand Down Expand Up @@ -437,7 +437,7 @@ protected bool IsVersionDownloaded(string version)
{
if (string.IsNullOrEmpty(version))
{
return IMS.Instance.VersionManager.LatestRelease.PhysicalLocation != null;
return IMS.Instance.VersionManager.LatestJavaRelease.PhysicalLocation != null;
}
else
{
Expand All @@ -452,7 +452,7 @@ protected void BeginVersionDownloadAndSet(string version)

protected async Task DownloadVersionAndSetAsync(string version)
{
ServerVersionInformation information = IMS.Instance.VersionManager.AvailableServerVersions.ContainsKey(version ?? "") ? IMS.Instance.VersionManager.AvailableServerVersions[version] : IMS.Instance.VersionManager.LatestRelease;
ServerVersionInformation information = IMS.Instance.VersionManager.AvailableServerVersions.ContainsKey(version ?? "") ? IMS.Instance.VersionManager.AvailableServerVersions[version] : IMS.Instance.VersionManager.LatestJavaRelease;
if (information.PhysicalLocation is null)
{
try
Expand Down
Binary file modified IMS-Interface/obj/Debug/netcoreapp3.1/RazorDeclaration/IMS-Interface.dll
View file
Binary file not shown.
Binary file modified IMS-Interface/obj/Debug/netcoreapp3.1/RazorDeclaration/IMS-Interface.pdb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion IMS-Interface/obj/Debug/netcoreapp3.1/RazorDeclaration/Pages/PluginManager.razor.g.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2226a6e616c3385951942e4b55189573b4b5465c"
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\PluginManager.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "da5ee26fbcda30a9f37cc9c8201a771d5e8dabff"
// <auto-generated/>
#pragma warning disable 1591
#pragma warning disable 0414
Expand Down
2 changes: 1 addition & 1 deletion IMS-Interface/obj/Debug/netcoreapp3.1/RazorDeclaration/Pages/ReleaseNotes.razor.g.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\ReleaseNotes.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5782e719c227e84573dfca64e93371c25d19d8e0"
#pragma checksum "D:\Projects\IntegratedMinecraftServer\IMS-Interface\Pages\ReleaseNotes.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0a534c3f787a2c2761a35bd6531ffa651ccbf23d"
// <auto-generated/>
#pragma warning disable 1591
#pragma warning disable 0414
Expand Down
Loading

0 comments on commit 07cc8f3

Please sign in to comment.