Fix bug and move ldtk full into LDtkpackage

IrishBruse · Sep 20, 2024 · 71b3229 · 71b3229
1 parent f47350d
commit 71b3229
Show file tree

Hide file tree

Showing 18 changed files with 1,827 additions and 1,722 deletions.
diff --git a/.github/workflows/nuget.yaml b/.github/workflows/nuget.yaml
@@ -45,6 +45,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: build
+    if: ${{ ! endsWith(inputs.version, '-beta') }}
     steps:
       - name: Create release
         env:

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-**/bin/
-**/obj/
-
-.vs/
-Nuget/
-**/lcov.info
+**/bin/
+**/obj/
+
+.vs/
+Nuget/
+**/lcov.info
diff --git a/LDtk.Codegen/Generators/BaseGenerator.cs b/LDtk.Codegen/Generators/BaseGenerator.cs
@@ -5,10 +5,11 @@ namespace LDtk.Codegen.Generators;
 using System.Text;
 
 using LDtk.Codegen;
+using LDtk.Full;
 
-public class BaseGenerator(LDtkFile ldtkFile, Options options)
+public class BaseGenerator(LDtkFileFull ldtkFile, Options options)
 {
-    internal readonly LDtkFile LDtkFile = ldtkFile;
+    internal readonly LDtkFileFull LDtkFile = ldtkFile;
     internal readonly Options Options = options;
 
     int indent;

diff --git a/LDtk.Codegen/Generators/ClassGenerator.cs b/LDtk.Codegen/Generators/ClassGenerator.cs
@@ -1,8 +1,9 @@
 namespace LDtk.Codegen.Generators;
 
 using LDtk.Codegen;
+using LDtk.Full;
 
-public class ClassGenerator(LDtkFile ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
+public class ClassGenerator(LDtkFileFull ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
 {
     public void Generate()
     {

diff --git a/LDtk.Codegen/Generators/EnumGenerator.cs b/LDtk.Codegen/Generators/EnumGenerator.cs
@@ -1,6 +1,8 @@
 namespace LDtk.Codegen.Generators;
 
-public class EnumGenerator(LDtkFile ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
+using LDtk.Full;
+
+public class EnumGenerator(LDtkFileFull ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
 {
     public void Generate()
     {

diff --git a/LDtk.Codegen/Generators/IidGenerator.cs b/LDtk.Codegen/Generators/IidGenerator.cs
@@ -1,6 +1,8 @@
 namespace LDtk.Codegen.Generators;
 
-public class IidGenerator(LDtkFile ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
+using LDtk.Full;
+
+public class IidGenerator(LDtkFileFull ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
 {
     public void Generate()
     {

diff --git a/LDtk.Codegen/LDtkFile.cs b/LDtk.Codegen/LDtkFile.cs
diff --git a/LDtk.Codegen/Program.cs b/LDtk.Codegen/Program.cs
@@ -6,8 +6,8 @@ namespace LDtk.Codegen;
 
 using CommandLine;
 
-using LDtk;
 using LDtk.Codegen.Generators;
+using LDtk.Full;
 
 public static class Program
 {
@@ -30,10 +30,9 @@ static void HandleParseError(IEnumerable<Error> errs)
 
     static void Run(Options opt)
     {
-        Console.WriteLine(opt);
         Options = opt;
 
-        LDtkFile file = LDtkFile.FromFile(Options.Input);
+        LDtkFileFull file = LDtkFileFull.FromFile(Options.Input);
 
         if (Version.Parse(file.JsonVersion) > Version.Parse(Constants.SupportedLDtkVersion))
         {