Skip to content

Commit db03a6e

Browse files
unknownunknown
authored andcommitted
Version 1.1.2. Pushed 9999 blocks limit to 999999 for items required. Added a config file that stores last IP:port used to connect.
1 parent c9c32ac commit db03a6e

File tree

6 files changed

+32
-9
lines changed

6 files changed

+32
-9
lines changed

MainWindow.xaml.cs

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System;
2+
using System.IO;
3+
using System.Text;
24
using System.Windows;
35
using System.Windows.Media;
46
using Challenges_App.Packet;
@@ -17,7 +19,8 @@ public partial class MainWindow : Window
1719
public static FontFamily MC_Bold = new FontFamily(new Uri("pack://application:,,,/"), "./Fonts/MC_Bold/#Minecraft");
1820
public static FontFamily MC_Italic = new FontFamily(new Uri("pack://application:,,,/"), "./Fonts/MC_Italic/#Minecraft");
1921
public static FontFamily MC_Bold_Italic = new FontFamily(new Uri("pack://application:,,,/"), "./Fonts/MC_Bold_Italic/#Minecraft");
20-
public static Version v = new Version(1, 1, 1);
22+
private static string LastIPFile = "config";
23+
public static Version v = new Version(1, 1, 2);
2124
public MainWindow()
2225
{
2326
Ressource.initTypes();
@@ -46,15 +49,35 @@ public void init(Boolean debug)
4649
{
4750
Instance = this;
4851
packetManager = null;
52+
if (!File.Exists(LastIPFile))
53+
{
54+
File.Create(LastIPFile).Close();
55+
updateLastIP("localhost:25575");
56+
}
4957
if (debug)
5058
{
5159
menu = new Pages.MainMenu();
5260
MainFrame.Navigate(menu);
5361
}
5462
else
5563
{
64+
string? lastIp;
65+
using (StreamReader sr = File.OpenText(LastIPFile))
66+
{
67+
lastIp = sr.ReadLine();
68+
}
5669
menu = null;
57-
MainFrame.Navigate(new Pages.Connect());
70+
MainFrame.Navigate(new Pages.Connect(lastIp));
71+
}
72+
}
73+
74+
public void updateLastIP(string lastip)
75+
{
76+
using (FileStream fs = File.OpenWrite(LastIPFile))
77+
{
78+
fs.SetLength(0); //clear old content
79+
byte[] info = new UTF8Encoding(true).GetBytes(lastip);
80+
fs.Write(info, 0, info.Length);
5881
}
5982
}
6083
}

Pages/Connect.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Label x:Name="lblAddrIP" Visibility="Hidden" ToolTip="Modifier l'adresse IP du serveur (P.ex: localhost:25575)" Content="Adresse IP" Style="{StaticResource lblFont1}" HorizontalContentAlignment="Center" FontSize="25" HorizontalAlignment="Left" VerticalAlignment="Top" Width="108" Height="32" Margin="56,104,0,0"/>
2626
</Grid>
2727
<Label x:Name="lblInfo" Content="Version {V} by Luca008" Style="{StaticResource lblFont1}" HorizontalContentAlignment="Right" FontSize="18" HorizontalAlignment="Right" Margin="0,378,10,0" VerticalContentAlignment="Center" VerticalAlignment="Top" Width="266" Height="32"/>
28-
<Label x:Name="lblSplash" Content="SkyWhale" Foreground="#FFFDFF00" Style="{StaticResource Minecraft}" FontSize="22" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="543,100,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
28+
<Label x:Name="lblSplash" Content="CryingT8" Foreground="#FFFDFF00" Style="{StaticResource Minecraft}" FontSize="22" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="543,100,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
2929
<Label.RenderTransform>
3030
<TransformGroup>
3131
<ScaleTransform x:Name="lblSplashScale" ScaleX="1" ScaleY="1"/>

Pages/Connect.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Diagnostics;
32
using System.Threading.Tasks;
43
using System.Windows;
54
using System.Windows.Controls;
@@ -15,11 +14,12 @@ namespace Challenges_App.Pages
1514
public partial class Connect : Page
1615
{
1716
private Boolean animate = true;
18-
public Connect()
17+
public Connect(string? lastIp)
1918
{
2019
InitializeComponent();
2120
lblAnimation();
2221
lblInfo.Content = lblInfo.Content.ToString().Replace("{V}", MainWindow.v.ToString());
22+
tbxAddrIP.Text = lastIp==null?"localhost:25575":lastIp;
2323
btnAccess.addMouseClick((c) =>
2424
{
2525
if(tbxKey.Text.Length == 0)
@@ -44,6 +44,7 @@ public Connect()
4444
MessageBox.Show("Le port spécifié n'est pas valide. Il doit se situer entre 1024 et 65535", "Error invalid port");
4545
return;
4646
}
47+
MainWindow.Instance.updateLastIP(ip + ":" + port);
4748
SocketManager? manager = MainWindow.Instance.packetManager;
4849
if(manager == null || !manager.isOnline)
4950
{

Pages/Meta/IMeta.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Newtonsoft.Json.Linq;
22
using System;
3-
using System.Diagnostics;
43

54
namespace Challenges_App.Pages.Meta
65
{
@@ -35,7 +34,7 @@ public static Meta forItem(String material)
3534

3635
public static IMeta? loadMeta(Item parent, Meta meta, JObject? json)
3736
{
38-
Type? type = Type.GetType("Challenges.Pages.Meta." + meta.ToString());
37+
Type? type = Type.GetType("Challenges_App.Pages.Meta." + meta.ToString());
3938
if (type != null)
4039
{
4140
if (json == null)

Pages/Required/IRequired.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ enum Required
1212

1313
public static IRequired? loadRequired(Required type, ChallengeSession session, JObject? json)
1414
{
15-
Type? t = Type.GetType("Challenges.Pages.Required." + type.ToString());
15+
Type? t = Type.GetType("Challenges_App.Pages.Required." + type.ToString());
1616
if (t != null)
1717
{
1818
if (json == null)

Pages/Required/Items.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private void NumericInput(object sender, TextCompositionEventArgs e)
207207
}
208208
else
209209
{
210-
if (((TextBox)sender).Text.Length > 3)
210+
if (((TextBox)sender).Text.Length > 5)
211211
{
212212
e.Handled = true;
213213
}

0 commit comments

Comments
 (0)