Skip to content

Commit

Permalink
Merge pull request #26 from takunology/2.0.2-dev
Browse files Browse the repository at this point in the history
Update version 2.0.2
  • Loading branch information
Takumi Okawa authored Apr 9, 2023
2 parents db7d652 + 98eca00 commit 7283353
Show file tree
Hide file tree
Showing 77 changed files with 652 additions and 722 deletions.
477 changes: 477 additions & 0 deletions MinecraftConnection/.gitignore

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified MinecraftConnection/.vs/MinecraftConnection/v17/.suo
Binary file not shown.
6 changes: 6 additions & 0 deletions MinecraftConnection/MinecraftConnection.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ VisualStudioVersion = 17.1.32210.238
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinecraftConnection", "MinecraftConnection\MinecraftConnection.csproj", "{B19912A9-A832-4941-BA28-3DA26A810EAD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.csproj", "{9B2112D3-1BBE-46E9-9F3D-F06CC1EE4FF5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -15,6 +17,10 @@ Global
{B19912A9-A832-4941-BA28-3DA26A810EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B19912A9-A832-4941-BA28-3DA26A810EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B19912A9-A832-4941-BA28-3DA26A810EAD}.Release|Any CPU.Build.0 = Release|Any CPU
{9B2112D3-1BBE-46E9-9F3D-F06CC1EE4FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B2112D3-1BBE-46E9-9F3D-F06CC1EE4FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B2112D3-1BBE-46E9-9F3D-F06CC1EE4FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9B2112D3-1BBE-46E9-9F3D-F06CC1EE4FF5}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public List<ItemStack> GetItems()

return items;
}

public void SetItems(List<ItemStack> items)
{
string result = PublicRcon.Rcon.SendCommand($"data get block {Position.X} {Position.Y} {Position.Z}");
Expand Down
7 changes: 4 additions & 3 deletions MinecraftConnection/MinecraftConnection/Entity/Fireworks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Linq;
using MinecraftConnection.Entity.Base;
using System;
using System.Collections.ObjectModel;

namespace MinecraftConnection.Entity
{
Expand All @@ -17,8 +18,8 @@ public class Fireworks : LivingEntityBase
public FireworkType Type { get; set; }
public bool Flicker { get; set; } = false;
public bool Trail { get; set; } = false;
public List<FireworkColors> Colors { get; set; } = new List<FireworkColors>();
public List<FireworkColors> FadeColors { get; set; } = new List<FireworkColors>();
public IList<FireworkColors> Colors { get; set; } = new List<FireworkColors>();
public IList<FireworkColors> FadeColors { get; set; } = new List<FireworkColors>();
public bool IsEmpty { get; set; } = false;

private class FireworkNBT
Expand Down Expand Up @@ -142,7 +143,7 @@ public static List<FireworkColors> RandomColors(byte colorCount)
{
var colors = new List<FireworkColors>();
var rand = new Random();
for (int i = 0; i < colorCount; colorCount++)
for (int i = 0; i < colorCount; i++)
{
colors.Add(SelectedFireworkColor(rand.Next(0, 16)));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<LangVersion>latest</LangVersion>
<Authors>Takumi Okawa (Takunology)</Authors>
<Company>Minecraft_with_Code_Project</Company>
<Version>2.0.1</Version>
<Version>2.0.2</Version>
<PackageId>MinecraftConnection</PackageId>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand All @@ -18,14 +18,20 @@
<Copyright>Copyright (c) 2021 Takumi Okawa (Takunology)</Copyright>
<PackageIconUrl />
<PackageTags>Minecraft</PackageTags>
<PackageReleaseNotes>Version 2.0.1
<PackageReleaseNotes>Version 2.0.2

- Add DisplayMessage() method</PackageReleaseNotes>
- Fixed RandomColors() method in FireworkOption class
- Added SetBlock method overload</PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="MCLogo.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2022-08-20T01:40:40.1812269Z;True|2022-08-20T10:36:51.1034346+09:00;True|2022-08-20T09:10:23.4166908+09:00;True|2022-02-15T21:50:15.1469967+09:00;</History>
<History>True|2023-04-09T16:39:46.9733314Z;True|2023-04-10T01:32:58.9666530+09:00;True|2022-08-20T10:40:40.1812269+09:00;True|2022-08-20T10:36:51.1034346+09:00;True|2022-08-20T09:10:23.4166908+09:00;True|2022-02-15T21:50:15.1469967+09:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"targets": {
".NETStandard,Version=v2.1": {},
".NETStandard,Version=v2.1/": {
"MinecraftConnection/2.0.0-preview1": {
"MinecraftConnection/2.0.1": {
"dependencies": {
"System.Text.Json": "6.0.3"
},
Expand Down Expand Up @@ -104,7 +104,7 @@
}
},
"libraries": {
"MinecraftConnection/2.0.0-preview1": {
"MinecraftConnection/2.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"targets": {
".NETStandard,Version=v2.1": {},
".NETStandard,Version=v2.1/": {
"MinecraftConnection/2.0.1": {
"MinecraftConnection/2.0.2": {
"dependencies": {
"System.Text.Json": "6.0.3"
},
Expand Down Expand Up @@ -104,7 +104,7 @@
}
},
"libraries": {
"MinecraftConnection/2.0.1": {
"MinecraftConnection/2.0.2": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.1", FrameworkDisplayName = "")]
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.1", FrameworkDisplayName = ".NET Standard 2.1")]
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright (c) 2021 Takumi Okawa (Takunology)")]
[assembly: System.Reflection.AssemblyDescriptionAttribute(@"MinecraftConnection is a library for sending commands via RCON using C# to support you learn and automate your programming. It can be run on a vanilla server as well as a Spigot server, including plugins. Before running the program, you need to start a Minecraft server that allows RCON connections.")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.2.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.2")]
[assembly: System.Reflection.AssemblyProductAttribute("MinecraftConnection")]
[assembly: System.Reflection.AssemblyTitleAttribute("MinecraftConnection")]
[assembly: System.Reflection.AssemblyVersionAttribute("2.0.0.0")]
[assembly: System.Reflection.AssemblyVersionAttribute("2.0.2.0")]
[assembly: System.Reflection.AssemblyMetadataAttribute("RepositoryUrl", "https://github.com/takunology/MinecraftConnection")]

// MSBuild WriteCodeFragment クラスによって生成されました。
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dbb19257d3cb418b3e64d4e86faf89ddc3caf992
282d325dab411b029c2b700535254c4e10846814
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"projects": {
"D:\\GitHub\\MinecraftConnection\\MinecraftConnection\\MinecraftConnection\\MinecraftConnection.csproj": {
"version": "2.0.1",
"version": "2.0.2",
"restore": {
"projectUniqueName": "D:\\GitHub\\MinecraftConnection\\MinecraftConnection\\MinecraftConnection\\MinecraftConnection.csproj",
"projectName": "MinecraftConnection",
Expand All @@ -14,14 +14,12 @@
"outputPath": "D:\\GitHub\\MinecraftConnection\\MinecraftConnection\\MinecraftConnection\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
"C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\takun\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netstandard2.1"
Expand Down Expand Up @@ -59,7 +57,8 @@
"net47",
"net471",
"net472",
"net48"
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
Expand All @@ -68,7 +67,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.302\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100\\RuntimeIdentifierGraph.json"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\takun\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\takun\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.1</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.3.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\takun\.nuget\packages\" />
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
<SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.1", FrameworkDisplayName = "")]
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.1", FrameworkDisplayName = ".NET Standard 2.1")]
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright (c) 2021 Takumi Okawa (Takunology)")]
[assembly: System.Reflection.AssemblyDescriptionAttribute(@"MinecraftConnection is a library for sending commands via RCON using C# to support you learn and automate your programming. It can be run on a vanilla server as well as a Spigot server, including plugins. Before running the program, you need to start a Minecraft server that allows RCON connections.")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.1.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.1")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.2.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.2")]
[assembly: System.Reflection.AssemblyProductAttribute("MinecraftConnection")]
[assembly: System.Reflection.AssemblyTitleAttribute("MinecraftConnection")]
[assembly: System.Reflection.AssemblyVersionAttribute("2.0.1.0")]
[assembly: System.Reflection.AssemblyVersionAttribute("2.0.2.0")]
[assembly: System.Reflection.AssemblyMetadataAttribute("RepositoryUrl", "https://github.com/takunology/MinecraftConnection")]

// MSBuild WriteCodeFragment クラスによって生成されました。
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7578404fe2289ba3d2b07d19842f022e6678767b
8a61b2791601bc8bb386901640ecee29366c6deb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 7283353

Please sign in to comment.