Leahnaya/pkNX
1
0
Fork 0
mirror of https://github.com/kwsch/pkNX.git synced 2026-10-02 06:06:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #129 from CodingKoopa/linux

Browse Source 
Fix Linux support
This commit is contained in:
Kurt
2021-02-27 23:23:35 -08:00
committed by GitHub
parent 8191030403 cc71b6357c
commit 187078f80b
10 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -28,7 +28,7 @@ pkNX also provides some utility to extract from supported container types, e.g.
pkNX is a Windows Forms application which requires [.NET Framework v4.6](https://www.microsoft.com/en-us/download/details.aspx?id=48137).
The executable can be built with any compiler that supports C# 8.
The executable can be built with any compiler that supports C# 9.
## Dependencies

4
pkNX.Containers/pkNX.Containers.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<Description>Packing &amp; Unpacking</Description>
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>

4
pkNX.Game/pkNX.Game.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<Description>Game Data Manager</Description>
<LangVersion>9</LangVersion>
</PropertyGroup>

2
pkNX.Randomization/pkNX.Randomization.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<Description>Randomizer Utility</Description>
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>

7
pkNX.Sprites/pkNX.Sprites.csproj
View File

@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;net46</TargetFrameworks>
<TargetFrameworks>net5.0;net461</TargetFrameworks>
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>
<ItemGroup>
@@ -11,6 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@@ -27,7 +29,6 @@
<ItemGroup Condition="$(TargetFramework.StartsWith('net5'))">
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
</ItemGroup>
</Project>

2
pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs
View File

@@ -73,7 +73,7 @@ public int[] Moves
public enum Scenario
{
None,
Legendary_Pokémon,
Legendary_Pokemon,
_2,
_3,
Eternatus,

2
pkNX.Structures/pkNX.Structures.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<Description>Data Structures</Description>
<LangVersion>9</LangVersion>
</PropertyGroup>

24
pkNX.WinForms/Dumping/FlatBufferConverter.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics;
using System;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
using Newtonsoft.Json;
@@ -119,9 +120,20 @@ private static void GenerateBinFrom<T>(T obj)
private static void RunFlatC(string args)
{
var fcp = Path.Combine(FlatPath, "flatc.exe");
if (!File.Exists(fcp))
File.WriteAllBytes(fcp, Resources.flatc);
String fcp = "";
// If there's a flatc on the path, prefer it.
foreach (var path in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator))
{
var fullPath = Path.Combine(path, "flatc");
if (File.Exists(fullPath))
fcp = fullPath;
}
if (string.IsNullOrEmpty(fcp))
{
fcp = Path.Combine(FlatPath, "flatc.exe");
if (!File.Exists(fcp))
File.WriteAllBytes(fcp, Resources.flatc);
}
using var process = new Process
{
@@ -130,8 +142,8 @@ private static void RunFlatC(string args)
WorkingDirectory = FlatPath,
WindowStyle = ProcessWindowStyle.Hidden,
CreateNoWindow = true,
FileName = "cmd.exe",
Arguments = $"/C flatc {args} & exit",
FileName = fcp,
Arguments = args,
}
};
process.Start();

20
pkNX.WinForms/Properties/Resources.resx
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -119,10 +119,10 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="BattleTowerPoke8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\battletowerpoke8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\BattleTowerPoke8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="BattleTowerTrainer8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\battletowertrainer8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\BattleTowerTrainer8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="EncounterArchive7b" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Flatbuffers\EncounterArchive7b.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -140,7 +140,7 @@
<value>..\Resources\Flatbuffers\EncounterStatic8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="EncounterTrade8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\encountertrade8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\EncounterTrade8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="EncounterUnderground8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Flatbuffers\EncounterUnderground8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -149,22 +149,22 @@
<value>..\Resources\Flatbuffers\flatc.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NestHoleCrystalEncounter8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\nestholecrystalencounter8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\NestHoleCrystalEncounter8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NestHoleDistributionEncounter8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\nestholedistributionencounter8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\NestHoleDistributionEncounter8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NestHoleDistributionReward8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\nestholedistributionreward8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\NestHoleDistributionReward8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NestHoleLevel8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\nestholelevel8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\NestHoleLevel8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="NestHoleReward8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\nestholereward8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\NestHoleReward8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="PlacementArea8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\flatbuffers\placementarea8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>..\Resources\Flatbuffers\PlacementArea8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Waza8" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Flatbuffers\Waza8.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

9
pkNX.WinForms/pkNX.WinForms.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net46</TargetFrameworks>
<TargetFrameworks>net461</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<RootNamespace>pkNX.WinForms</RootNamespace>
<Company>Project Pokémon</Company>
@@ -13,6 +13,7 @@
<AssemblyName>pkNX</AssemblyName>
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>
<ItemGroup>
@@ -86,4 +87,8 @@
<None Include="Resources\Flatbuffers\EncounterTrade8Archive.fbs" />
<None Include="Resources\Flatbuffers\Waza8.fbs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
</ItemGroup>
</Project>