v1.3.0 fixed bugs and added skull meta cache option

Lucaa8 · Lucaa8 · commit aa70cdd91e67 · 2025-10-12T23:14:26.000+02:00
diff --git a/Pages/Connect.xaml.cs b/Pages/Connect.xaml.cs
@@ -61,6 +61,7 @@ public Connect(string? lastIp)
                         LoginPacket lp = (LoginPacket)packet;
                         if (!lp.isAllowed())
                         {
+                            manager.stop();
                             MessageBox.Show("Le serveur n'a pas autorisé l'accès à cette ressource.\nRaison: " + lp.getReason(), "Error disallowed", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
                         else
diff --git a/Pages/Item.xaml.cs b/Pages/Item.xaml.cs
@@ -525,6 +525,10 @@ private void onMaterialClick(object sender, MouseButtonEventArgs e)
                 {
                     tbxMaterial.Text = mat.ToString();
                     rectOverlayMaterial.ToolTip = (tbxMaterial.Text.Length > 20) ? mat.ToString() : null;
+                    if(itemmeta != null)
+                    {
+                        MessageBox.Show("Un ItemMeta de type " + itemmeta.getMeta().ToString() + " existe encore sur cet Item.\n\nEnvoyer l'item dans cet état au serveur compromettra la configuration!\n\nSolutions;\n1) Remettre un Material qui supporte cet ItemMeta\n2) Cliquer sur le bouton \"Meta perso.\" afin d'actualiser l'ItemMeta pour ce nouveau Material", "Invalid ItemMeta for " + mat, MessageBoxButton.OK, MessageBoxImage.Warning);
+                    }
                 }
             });
         }
diff --git a/Pages/Meta/Skull.xaml b/Pages/Meta/Skull.xaml
@@ -9,14 +9,22 @@
 
     <Grid x:Name="PageSkull">
         <Label x:Name="lblTitle" Style="{StaticResource lblFont1}" FontSize="30" Content="ItemMeta(Skull) de [I]" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-        <Label x:Name="lblType" ToolTip="PLAYER = Joueur dynamique (Celui qui complète le challenge p.exemple)&#xA;//!!\\ NE PAS METTRE 'PLAYER' SI C'EST POUR UN ITEM REQUIS //!!\\&#xA;PSEUDO = Pseudo de joueur fixe (Luca008 p.exemple)&#xA;MCHEADS = Une tête customisée du site minecraft-heads.com (Tête en question->Tout en bas->Value)" Content="Type :" Style="{StaticResource ResourceKey=lblFont1}" FontSize="25" HorizontalAlignment="Left" Margin="65,144,0,0" VerticalAlignment="Top" VerticalContentAlignment="Center" Height="38" Width="118"/>
-        <ComboBox x:Name="cbxType" SelectedIndex="0" VerticalContentAlignment="Center" HorizontalAlignment="Left" Margin="188,150,0,0" Style="{StaticResource lblFont1}" FontSize="20" VerticalAlignment="Top" Width="100" Height="28" SelectionChanged="cbxType_SelecChanged">
+        <Label x:Name="lblType" ToolTip="PLAYER = Joueur dynamique (Celui qui complète le challenge p.exemple)&#xA;//!!\\ NE PAS METTRE 'PLAYER' SI C'EST POUR UN ITEM REQUIS //!!\\&#xA;PSEUDO = Pseudo de joueur fixe (Luca008 p.exemple)&#xA;MCHEADS = Une tête customisée du site minecraft-heads.com (Tête en question->Tout en bas->Value)" Content="Type :" Style="{StaticResource ResourceKey=lblFont1}" FontSize="25" HorizontalAlignment="Left" Margin="65,144,0,0" VerticalAlignment="Top" VerticalContentAlignment="Center" Height="38" Width="200"/>
+        <ComboBox x:Name="cbxType" SelectedIndex="0" VerticalContentAlignment="Center" HorizontalAlignment="Left" Margin="270,150,0,0" Style="{StaticResource lblFont1}" FontSize="20" VerticalAlignment="Top" Width="100" Height="28" SelectionChanged="cbxType_SelecChanged">
             <ComboBoxItem Content="PLAYER"/>
             <ComboBoxItem Content="PSEUDO"/>
             <ComboBoxItem Content="MCHEADS"/>
         </ComboBox>
-        <Label x:Name="lblValue" Content="Valeur :" Style="{StaticResource ResourceKey=lblFont1}" FontSize="25" HorizontalAlignment="Left" Margin="65,226,0,0" VerticalAlignment="Top" VerticalContentAlignment="Center" Height="38" Width="118"/>
-        <TextBox x:Name="tbxValue" IsEnabled="False" HorizontalAlignment="Left" VerticalContentAlignment="Center" Style="{StaticResource lblFont1}" FontSize="20" Margin="188,232,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="190" Height="25"/>
+        <Label x:Name="lblValue" Content="Valeur :" Style="{StaticResource ResourceKey=lblFont1}" FontSize="25" HorizontalAlignment="Left" Margin="65,226,0,0" VerticalAlignment="Top" VerticalContentAlignment="Center" Height="38" Width="200"/>
+        <TextBox x:Name="tbxValue" IsEnabled="False" HorizontalAlignment="Left" VerticalContentAlignment="Center" Style="{StaticResource lblFont1}" FontSize="20" Margin="270,232,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="190" Height="25"/>
+        <Canvas x:Name="cvCache" Visibility="Hidden">
+            <Canvas x:Name="cvCacheError" Visibility="Hidden">
+                <Label Content="Le texte entré n'est pas un entier entre 0 et 2'419'200 (1 semaine)." HorizontalAlignment="Left" VerticalAlignment="Top" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Style="{StaticResource ResourceKey=lblFont1}" FontSize="15" Width="366" Height="25" Margin="65,340,0,0" Foreground="Red"/>
+                <Label Content="⚠️ Il sera remplacé par 3600 lors de la sauvegarde sur le serveur. ⚠️" HorizontalAlignment="Left" VerticalAlignment="Top" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Style="{StaticResource ResourceKey=lblFont1}" FontSize="15" Width="400" Height="25" Margin="65,360,0,0" Foreground="Red"/>
+            </Canvas>
+            <Label x:Name="lblCache" Content="Cache (secondes) :" ToolTip="Combien de temps la texture du skin reste en mémoire avant que le plugin renvoie une requête aux serveurs Mojang. (Mettre 0 pour désactiver le caching)" Style="{StaticResource ResourceKey=lblFont1}" FontSize="25" HorizontalAlignment="Left" Margin="65,308,0,0" VerticalAlignment="Top" VerticalContentAlignment="Center" Height="38" Width="200"/>
+            <TextBox x:Name="tbxCache" HorizontalAlignment="Left" VerticalContentAlignment="Center" Text="3600" Style="{StaticResource lblFont1}" FontSize="20" Margin="270,314,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100" Height="25" TextChanged="tbxCache_TextChanged"/>
+        </Canvas>
         <Polygon x:Name="btnBack" Cursor="Hand" Points="40,0 40,40 0,20" Stroke="Black" Fill="Black" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="21,10,0,0" Width="40" Height="40" MouseEnter="btnBack_MouseEnter" MouseLeave="btnBack_MouseLeave" MouseUp="btnBack_Click">
             <Polygon.RenderTransform>
                 <ScaleTransform ScaleX="1" ScaleY="1"/>
diff --git a/Pages/Meta/Skull.xaml.cs b/Pages/Meta/Skull.xaml.cs
@@ -14,6 +14,11 @@ namespace Challenges_App.Pages.Meta
     public partial class Skull : Page, IMeta
     {
         private Item parent;
+
+        private int minCache = 0;
+        private int maxCache = 2_419_200; //1 week / 7 days
+        private Func<int, bool> ValidateCache => cache => cache >= minCache && cache <= maxCache;
+
         public Skull(Item parent)
         {
             this.parent = parent;
@@ -38,6 +43,10 @@ public Skull(Item parent, JObject json) : this(parent)
             {
                 tbxValue.Text = json.Value<String>("Owner");
             }
+            if(json.ContainsKey("UseCache"))
+            {
+                tbxCache.Text = json.Value<Int32>("UseCache").ToString();
+            }
         }
 
         IMeta.Meta IMeta.getMeta()
@@ -58,10 +67,27 @@ JObject IMeta.toJson()
             if (!type.Equals("PLAYER"))
             {
                 json["Owner"] = tbxValue.Text;
-            } 
+            }
+            if(type.Equals("PSEUDO"))
+            {
+                if(Int32.TryParse(tbxCache.Text, out var cache) && ValidateCache(cache))
+                {
+                    json["UseCache"] = cache;
+                } else {
+                    json["UseCache"] = 3600;
+                    // Just update the GUI field in case the player saves this item (either by saving it locally or sending it to the server by sending a challenge using it)
+                    // and then later on come back on this page, to avoid desync
+                    tbxCache.Text = "3600";
+                }
+            }
             return json;
         }
 
+        private void tbxCache_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            cvCacheError.Visibility = Int32.TryParse(tbxCache.Text, out var cache) && ValidateCache(cache) ? Visibility.Hidden : Visibility.Visible;
+        }
+
         private void cbxType_SelecChanged(object sender, SelectionChangedEventArgs e)
         {
             if (tbxValue == null) return;
@@ -73,20 +99,26 @@ private void cbxType_SelecChanged(object sender, SelectionChangedEventArgs e)
                         tbxValue.Height = 25;
                         tbxValue.IsEnabled = false;
                         tbxValue.Text = "";
+                        cvCache.Visibility = Visibility.Hidden;
+                        tbxCache.Text = "";
                     }
                     break;
                 case 1: //PSEUDO
                     {
                         tbxValue.Width = 190;
                         tbxValue.Height = 25;
                         tbxValue.IsEnabled = true;
+                        cvCache.Visibility = Visibility.Visible;
+                        tbxCache.Text = "3600";
                     }
                     break;
                 case 2: //MCHEADS
                     {
-                        tbxValue.Width = 540;
+                        tbxValue.Width = 500;
                         tbxValue.Height = 90;
                         tbxValue.IsEnabled = true;
+                        cvCache.Visibility = Visibility.Hidden;
+                        tbxCache.Text = "";
                     }
                     break;
             }
@@ -112,5 +144,6 @@ private void btnBack_Click(object sender, MouseButtonEventArgs e)
         {
             MainWindow.Instance.MainFrame.Navigate(parent);
         }
+
     }
 }
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml b/Properties/PublishProfiles/FolderProfile.pubxml
@@ -5,12 +5,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
+    <Platform>x64</Platform>
     <PublishDir>bin\Release\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0-windows</TargetFramework>
     <SelfContained>false</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishSingleFile>true</PublishSingleFile>
   </PropertyGroup>
 </Project>
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2025-02-20T18:33:04.0664270Z||;True|2025-02-03T00:16:23.8815363+01:00||;True|2025-02-03T00:15:00.3025328+01:00||;True|2023-10-14T15:02:18.7626300+02:00||;True|2023-10-14T13:52:30.4135204+02:00||;True|2023-10-13T22:55:47.4867070+02:00||;True|2023-10-13T22:55:27.6407595+02:00||;True|2023-10-13T22:54:59.5717476+02:00||;True|2023-10-13T22:53:20.5445468+02:00||;True|2022-08-21T17:07:33.5385272+02:00||;True|2022-07-23T22:23:59.7845278+02:00||;True|2022-01-17T20:51:22.3444736+01:00||;True|2022-01-17T15:24:11.0506125+01:00||;True|2022-01-17T15:22:51.3003623+01:00||;True|2022-01-17T15:22:04.6797333+01:00||;False|2022-01-17T15:20:15.9710703+01:00||;False|2022-01-17T15:19:50.4001956+01:00||;True|2022-01-17T15:18:44.5443997+01:00||;True|2022-01-17T15:16:58.3305098+01:00||;True|2022-01-17T15:16:03.5282079+01:00||;</History>
+    <History>True|2025-10-12T21:06:05.3757716Z||;True|2025-10-12T23:00:30.8474538+02:00||;True|2025-10-12T22:55:29.5403998+02:00||;True|2025-10-12T22:54:51.1519277+02:00||;True|2025-10-12T22:53:58.9278789+02:00||;True|2025-10-12T22:52:14.3659738+02:00||;True|2025-02-20T19:33:04.0664270+01:00||;True|2025-02-03T00:16:23.8815363+01:00||;True|2025-02-03T00:15:00.3025328+01:00||;True|2023-10-14T15:02:18.7626300+02:00||;True|2023-10-14T13:52:30.4135204+02:00||;True|2023-10-13T22:55:47.4867070+02:00||;True|2023-10-13T22:55:27.6407595+02:00||;True|2023-10-13T22:54:59.5717476+02:00||;True|2023-10-13T22:53:20.5445468+02:00||;True|2022-08-21T17:07:33.5385272+02:00||;True|2022-07-23T22:23:59.7845278+02:00||;True|2022-01-17T20:51:22.3444736+01:00||;True|2022-01-17T15:24:11.0506125+01:00||;True|2022-01-17T15:22:51.3003623+01:00||;True|2022-01-17T15:22:04.6797333+01:00||;False|2022-01-17T15:20:15.9710703+01:00||;False|2022-01-17T15:19:50.4001956+01:00||;True|2022-01-17T15:18:44.5443997+01:00||;True|2022-01-17T15:16:58.3305098+01:00||;True|2022-01-17T15:16:03.5282079+01:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public Connect(string? lastIp)`
`61`	`61`	`LoginPacket lp = (LoginPacket)packet;`
`62`	`62`	`if (!lp.isAllowed())`
`63`	`63`	`{`
	`64`	`+ manager.stop();`
`64`	`65`	`MessageBox.Show("Le serveur n'a pas autorisé l'accès à cette ressource.\nRaison: " + lp.getReason(), "Error disallowed", MessageBoxButton.OK, MessageBoxImage.Error);`
`65`	`66`	`}`
`66`	`67`	`else`
Original file line number	Diff line number	Diff line change
`@@ -525,6 +525,10 @@ private void onMaterialClick(object sender, MouseButtonEventArgs e)`
`525`	`525`	`{`
`526`	`526`	`tbxMaterial.Text = mat.ToString();`
`527`	`527`	`rectOverlayMaterial.ToolTip = (tbxMaterial.Text.Length > 20) ? mat.ToString() : null;`
	`528`	`+ if(itemmeta != null)`
	`529`	`+ {`
	`530`	`+ MessageBox.Show("Un ItemMeta de type " + itemmeta.getMeta().ToString() + " existe encore sur cet Item.\n\nEnvoyer l'item dans cet état au serveur compromettra la configuration!\n\nSolutions;\n1) Remettre un Material qui supporte cet ItemMeta\n2) Cliquer sur le bouton \"Meta perso.\" afin d'actualiser l'ItemMeta pour ce nouveau Material", "Invalid ItemMeta for " + mat, MessageBoxButton.OK, MessageBoxImage.Warning);`
	`531`	`+ }`
`528`	`532`	`}`
`529`	`533`	`});`
`530`	`534`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@ namespace Challenges_App.Pages.Meta`
`14`	`14`	`public partial class Skull : Page, IMeta`
`15`	`15`	`{`
`16`	`16`	`private Item parent;`
	`17`	`+`
	`18`	`+ private int minCache = 0;`
	`19`	`+ private int maxCache = 2_419_200; //1 week / 7 days`
	`20`	`+ private Func<int, bool> ValidateCache => cache => cache >= minCache && cache <= maxCache;`
	`21`	`+`
`17`	`22`	`public Skull(Item parent)`
`18`	`23`	`{`
`19`	`24`	`this.parent = parent;`
`@@ -38,6 +43,10 @@ public Skull(Item parent, JObject json) : this(parent)`
`38`	`43`	`{`
`39`	`44`	`tbxValue.Text = json.Value<String>("Owner");`
`40`	`45`	`}`
	`46`	`+ if(json.ContainsKey("UseCache"))`
	`47`	`+ {`
	`48`	`+ tbxCache.Text = json.Value<Int32>("UseCache").ToString();`
	`49`	`+ }`
`41`	`50`	`}`
`42`	`51`
`43`	`52`	`IMeta.Meta IMeta.getMeta()`
`@@ -58,10 +67,27 @@ JObject IMeta.toJson()`
`58`	`67`	`if (!type.Equals("PLAYER"))`
`59`	`68`	`{`
`60`	`69`	`json["Owner"] = tbxValue.Text;`
`61`		`- }`
	`70`	`+ }`
	`71`	`+ if(type.Equals("PSEUDO"))`
	`72`	`+ {`
	`73`	`+ if(Int32.TryParse(tbxCache.Text, out var cache) && ValidateCache(cache))`
	`74`	`+ {`
	`75`	`+ json["UseCache"] = cache;`
	`76`	`+ } else {`
	`77`	`+ json["UseCache"] = 3600;`
	`78`	`+ // Just update the GUI field in case the player saves this item (either by saving it locally or sending it to the server by sending a challenge using it)`
	`79`	`+ // and then later on come back on this page, to avoid desync`
	`80`	`+ tbxCache.Text = "3600";`
	`81`	`+ }`
	`82`	`+ }`
`62`	`83`	`return json;`
`63`	`84`	`}`
`64`	`85`
	`86`	`+ private void tbxCache_TextChanged(object sender, TextChangedEventArgs e)`
	`87`	`+ {`
	`88`	`+ cvCacheError.Visibility = Int32.TryParse(tbxCache.Text, out var cache) && ValidateCache(cache) ? Visibility.Hidden : Visibility.Visible;`
	`89`	`+ }`
	`90`	`+`
`65`	`91`	`private void cbxType_SelecChanged(object sender, SelectionChangedEventArgs e)`
`66`	`92`	`{`
`67`	`93`	`if (tbxValue == null) return;`
`@@ -73,20 +99,26 @@ private void cbxType_SelecChanged(object sender, SelectionChangedEventArgs e)`
`73`	`99`	`tbxValue.Height = 25;`
`74`	`100`	`tbxValue.IsEnabled = false;`
`75`	`101`	`tbxValue.Text = "";`
	`102`	`+ cvCache.Visibility = Visibility.Hidden;`
	`103`	`+ tbxCache.Text = "";`
`76`	`104`	`}`
`77`	`105`	`break;`
`78`	`106`	`case 1: //PSEUDO`
`79`	`107`	`{`
`80`	`108`	`tbxValue.Width = 190;`
`81`	`109`	`tbxValue.Height = 25;`
`82`	`110`	`tbxValue.IsEnabled = true;`
	`111`	`+ cvCache.Visibility = Visibility.Visible;`
	`112`	`+ tbxCache.Text = "3600";`
`83`	`113`	`}`
`84`	`114`	`break;`
`85`	`115`	`case 2: //MCHEADS`
`86`	`116`	`{`
`87`		`- tbxValue.Width = 540;`
	`117`	`+ tbxValue.Width = 500;`
`88`	`118`	`tbxValue.Height = 90;`
`89`	`119`	`tbxValue.IsEnabled = true;`
	`120`	`+ cvCache.Visibility = Visibility.Hidden;`
	`121`	`+ tbxCache.Text = "";`
`90`	`122`	`}`
`91`	`123`	`break;`
`92`	`124`	`}`
`@@ -112,5 +144,6 @@ private void btnBack_Click(object sender, MouseButtonEventArgs e)`
`112`	`144`	`{`
`113`	`145`	`MainWindow.Instance.MainFrame.Navigate(parent);`
`114`	`146`	`}`
	`147`	`+`
`115`	`148`	`}`
`116`	`149`	`}`