improve: clean up

Reviewed-on: #2

.gitignore

@@ -3,3 +3,9 @@ obj/
 /packages/
 riderModule.iml
 /_ReSharper.Caches/
+Package/embedded/polonium_templates/
+Package/embedded/Patches/RegistryPassThrough.p.cs
+VersionInfo.props
+Polonium.sln.DotSettings.user
+.godot
+.idea

.idea/.idea.Polonium/.idea/.gitignore

@@ -1,13 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/.idea.Hangman.SDK.iml
-/modules.xml
-/projectSettingsUpdater.xml
-/contentModel.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/.idea.Polonium/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
-</project>

.idea/.idea.Polonium/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>

.idea/.idea.Polonium/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/../Polonium.Generators" vcs="Git" />
-  </component>
-</project>

Package/build/Polonium.targets

@@ -41,8 +41,16 @@
             <EmbeddedFiles Include="$(MSBuildThisFileDirectory)embedded/**/*.*"/>
         </ItemGroup>
         <Copy 
-            SourceFiles="@(EmbeddedFiles)"
+                SourceFiles="@(EmbeddedFiles)" 
-            DestinationFolder="$(ProjectDir)embedded/%(RecursiveDir)"
+                DestinationFolder="$(ProjectDir)embedded/%(RecursiveDir)"
+        />
+        <Copy 
+                SourceFiles="$(MSBuildThisFileDirectory)editorconfig"
+                DestinationFiles="$(ProjectDir).editorconfig"
+        />
+        <Copy 
+                SourceFiles="$(MSBuildThisFileDirectory)gitignore" 
+                DestinationFiles="$(ProjectDir)embedded/.gitignore"
         />
         <ItemGroup>
             <PoloniumTemplateFiles Include="$(MSBuildThisFileDirectory)embedded/polonium_templates/**/*.*" />

Package/build/editorconfig

@@ -0,0 +1,2 @@
+[embedded/*]
+generated_code = true

Package/build/gitignore

@@ -0,0 +1 @@
+*

Package/embedded/GlobalClasses/Nodes/Buttons/PoloniumTextureButton.cs

@@ -24,7 +24,7 @@ public partial class PoloniumTextureButton : TextureButton
         set
         {
             PrivateTextureSetName = value;
-            t = GlobalRegistry.TextureSetMap.GetValueOrDefault(value, null);
+            TextureSet t = GlobalRegistry.TextureSetMap.GetValueOrDefault(value, null);
             if (t is not null)
             {
                 TextureNormal = t.Normal;

Package/embedded/Patches/GlobalRegistry.p.cs

@@ -45,7 +45,6 @@ public static partial class GlobalRegistry
     }
     public static PoloniumRegistry PoloniumRegistry => PoloniumRegistry.Instance;
     public static bool Paused { get; set; }
-    public static HashSet<ITimeConsumer> TimeConsumers { get; } = [];
     public static void Prepare() => PoloniumRegistry.Prepare();
 
     // ReSharper disable once PartialTypeWithSinglePart

Polonium.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Godot.NET.Sdk/4.4.0-beta.3">
-
+    <Import Project="VersionInfo.props" Condition="Exists('VersionInfo.props')" />
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -8,12 +8,13 @@
         <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
         <PackageId>Polonium</PackageId>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>0.1.1-x</Version>
+        <Version>$(PoloniumVersion)</Version>
         <Authors>Hangman</Authors>
         <DisableImplicitRestore>true</DisableImplicitRestore>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Polonium.Tasks" Version="0.1.1-x" />
+        <PackageReference Include="Polonium.Tasks" Version="$(PoloniumTasksVersion)" />
+        <None Include="VersionInfo.props" Pack="true" PackagePath="build" Condition="Exists('VersionInfo.props')" />
     </ItemGroup>
     <Target Name="Prepare" BeforeTargets="BeforeBuild">
         <RemoveDir Directories="$(ProjectDir)Package/embedded/polonium_templates" Condition="Exists('$(ProjectDir)Package/polonium_templates')"/>
@@ -23,16 +24,23 @@
                 TemplateDirectory="$(ProjectDir)Package/embedded/polonium_templates"
                 AttributeName="ProxyNode"
         />
+        <Delete 
+                Files="$(ProjectDir)Package/embedded/RegistryPassThrough.p.cs" 
+                Condition="Exists('$(ProjectDir)Package/embedded/RegistryPassThrough.p.cs')"
+        />
+        <GenerateRegistryPassThrough ProjectDir="$(ProjectDir)" />
     </Target>
     
     <ItemGroup>
         <None Include="NuGet.config" />
-        <None Include="Package/build/$(AssemblyName).targets" Pack="true" PackagePath="build" />
+        <None Include="Package/build/**/*" Pack="true" PackagePath="build" />
-        <None Include="Package/build/$(AssemblyName).props" Pack="true" PackagePath="build" />
         <None Include="Package/embedded/**/*.*" Pack="true" PackagePath="build/embedded" />
         <None Include="publish" />
-        <None Include="build" />
+        <Compile Remove="Package/**/*.*" />
-        <Compile Remove="Package/**/*.*"/>
+    </ItemGroup>
+    
+    <ItemGroup>
+      <None Include="Package\build\editorconfig" />
     </ItemGroup>
     
     <Target Name="CleanPreviousPackages" BeforeTargets="Build">
@@ -57,6 +65,7 @@
     <Target Name="RestoreNoCache" BeforeTargets="Build">
         <Message Text="Restoring packages with no chache" Importance="high" />
         <Exec Command="dotnet restore --no-cache" />
+        
     </Target>
     
 </Project>

build

@@ -1,17 +0,0 @@
-#! /bin/bash
-rm -rf ~/.nuget/packages/polonium*
-cd ../Polonium.Tasks
-dotnet clean Polonium.Tasks.csproj
-dotnet restore Polonium.Tasks.csproj
-dotnet build Polonium.Tasks.csproj
-
-cd ../Polonium.Generators
-dotnet clean Polonium.Generators.csproj
-dotnet restore Polonium.Generators.csproj
-dotnet build Polonium.Generators.csproj
-
-cd ../Polonium
-rm -rf ~/.nuget/packages/polonium*
-dotnet clean Polonium.csproj
-dotnet restore Polonium.csproj
-dotnet build Polonium.csproj

publish

@@ -1,2 +1,12 @@
 #!/bin/bash
-dotnet nuget push "$(ls -t ./.godot/mono/temp/bin/Debug/Polonium.*.nupkg | head -n 1)" --source hangman-lab
+
+SCRIPT_DIR=$(dirname "$(realpath "${BASH_SOURCE[0]}")")/
+LATEST_PACKAGE=$(ls -t "${SCRIPT_DIR}".godot/mono/temp/bin/Debug/Polonium.*.nupkg  2>/dev/null | head -n 1)
+
+if [[ -z "$LATEST_PACKAGE" ]]; then
+    echo "❌ Error: No .nupkg file found in ${SCRIPT_DIR}/bin/Debug/"
+    exit 1
+fi
+echo "🚀 Pushing NuGet package: $LATEST_PACKAGE"
+dotnet nuget push "$LATEST_PACKAGE" --source hangman-lab
+

src/Attributes/RegistryPassThrough.cs

@@ -0,0 +1,6 @@
+namespace Polonium.Attributes;
+[AttributeUsage(AttributeTargets.Property)]
+public class RegistryPassThrough(bool getterOnly = false) : Attribute
+{
+    public bool GetterOnly { get; set; } = getterOnly;
+}

src/PoloniumRegistry.cs

@@ -1,5 +1,6 @@
 using Godot;
 using Polonium.Agents;
+using Polonium.Attributes;
 using Polonium.Interfaces;
 using Polonium.Resources;
 
@@ -7,19 +8,24 @@ namespace Polonium;
 
 public class PoloniumRegistry
 {
-    public static IGlobalRegistry GlobalRegistry { get; set; }
     private static PoloniumRegistry InternalInstance { get; set; }
     public static PoloniumRegistry Instance => InternalInstance ??= new PoloniumRegistry();
+    [RegistryPassThrough]
     public Config Config { get; set; }
+    [RegistryPassThrough]
     public Save Save { get; set; }
 
     public static void Prepare()
     {
         DirAccess.MakeDirAbsolute("user://saves");
     }
-    public Dictionary<string, Agent> Agents { get; set; } = new();
+    // ReSharper disable once CollectionNeverQueried.Global
+    [RegistryPassThrough(true)]
+    public Dictionary<string, Agent> Agents { get; } = new();
     
-    public HashSet<ITimeConsumer> TimeConsumers { get; set; } = new();
+    // ReSharper disable once CollectionNeverQueried.Global
+    [RegistryPassThrough(true)]
+    public HashSet<ITimeConsumer> TimeConsumers { get; } = new();
     
 
 }