Skip to content

Commit 3ef4320

Browse files
committed
Version 1.1
1 parent 649c7c6 commit 3ef4320

File tree

13 files changed

+471
-193
lines changed

13 files changed

+471
-193
lines changed

RedstoneCalculator/Assets/Icon.ico

2.07 KB
Binary file not shown.
File renamed without changes.
68.7 KB
Binary file not shown.
File renamed without changes.

RedstoneCalculator/MainWindow.Designer.cs

Lines changed: 191 additions & 177 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RedstoneCalculator/MainWindow.cs

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
using System;
2+
using System.Drawing;
3+
using System.Drawing.Text;
4+
using System.Runtime.InteropServices;
25
using System.Windows.Forms;
36

47
namespace RedstoneCalculator
@@ -8,6 +11,27 @@ public partial class MainWindow : Form
811
public MainWindow()
912
{
1013
InitializeComponent();
14+
15+
byte[] font = Properties.Resources.Minecraftia;
16+
PrivateFontCollection pfc = new PrivateFontCollection();
17+
IntPtr pointer = Marshal.AllocCoTaskMem(font.Length);
18+
Marshal.Copy(font, 0, pointer, font.Length);
19+
pfc.AddMemoryFont(pointer, font.Length);
20+
Marshal.FreeCoTaskMem(pointer);
21+
Font minecraftia = new Font(pfc.Families[0], 10);
22+
23+
redstoneResult.Font = minecraftia;
24+
redstoneTorchResult.Font = minecraftia;
25+
stoneResult.Font = minecraftia;
26+
cobblestoneResult.Font = minecraftia;
27+
ironIngotResult.Font = minecraftia;
28+
bowResult.Font = minecraftia;
29+
glowstoneResult.Font = minecraftia;
30+
quartzResult.Font = minecraftia;
31+
woodenSlabResult.Font = minecraftia;
32+
glassResult.Font = minecraftia;
33+
slimeResult.Font = minecraftia;
34+
woodenPlanksResult.Font = minecraftia;
1135
}
1236

1337
private void clear(TextBox textBox)
@@ -36,9 +60,10 @@ private void clear(TextBox textBox)
3660
textBox.Enabled = true;
3761
}
3862

39-
private void setText(Label label, int number)
63+
private void setText(Control label, int number)
4064
{
41-
label.Text = number.ToString();
65+
if (number > 999) label.Text = "∞";
66+
else label.Text = number.ToString();
4267
}
4368

4469
private int getAmount(TextBox textBox)

RedstoneCalculator/MainWindow.resx

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,45 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121-
<value>17, 17</value>
122-
</metadata>
120+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121+
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
122+
<value>
123+
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
158+
7/BfjcGDK1xl4NsAAAAASUVORK5CYII=
159+
</value>
160+
</data>
123161
</root>

RedstoneCalculator/Program.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ namespace RedstoneCalculator
88
{
99
static class Program
1010
{
11-
/// <summary>
12-
/// The main entry point for the application.
13-
/// </summary>
1411
[STAThread]
1512
static void Main()
1613
{
1714
Application.EnableVisualStyles();
18-
Application.SetCompatibleTextRenderingDefault(false);
15+
Application.SetCompatibleTextRenderingDefault(true);
1916
Application.Run(new MainWindow());
2017
}
2118
}

RedstoneCalculator/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("RedstoneCalculator")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
13+
[assembly: AssemblyCopyright("")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.1.0.0")]
36+
[assembly: AssemblyFileVersion("1.1.0.0")]

RedstoneCalculator/Properties/Resources.Designer.cs

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)