mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Last minute changes for 1.6.0 + Changes from #13
- Some last minute changes made just before releasing 1.6.0 to Minecraft Forums - Added changes from pull #13 allowing to remove the BouncyCastle library
This commit is contained in:
parent
551c152c7c
commit
ff950a5248
6 changed files with 8 additions and 13 deletions
|
|
@ -118,9 +118,8 @@ namespace MinecraftClient
|
||||||
else //No external dictionnary found.
|
else //No external dictionnary found.
|
||||||
{
|
{
|
||||||
Console.ForegroundColor = ConsoleColor.DarkGray;
|
Console.ForegroundColor = ConsoleColor.DarkGray;
|
||||||
ConsoleIO.WriteLine("MC 1.6+ warning: Translations file \"" + Settings.TranslationsFile + "\" not found."
|
ConsoleIO.WriteLine("MC 1.6+ warning: Translations file not found: \"" + Settings.TranslationsFile + "\""
|
||||||
+ "\nYou can pick a translation file from .minecraft\\assets\\lang\\"
|
+ "\nYou can pick a translation file from .minecraft\\assets\\lang\\"
|
||||||
+ "\nCopy to the same folder as MinecraftClient & rename to \"" + Settings.TranslationsFile + "\""
|
|
||||||
+ "\nSome messages won't be properly printed without this file.");
|
+ "\nSome messages won't be properly printed without this file.");
|
||||||
Console.ForegroundColor = ConsoleColor.Gray;
|
Console.ForegroundColor = ConsoleColor.Gray;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,6 @@ using java.security;
|
||||||
using java.security.spec;
|
using java.security.spec;
|
||||||
using javax.crypto;
|
using javax.crypto;
|
||||||
using javax.crypto.spec;
|
using javax.crypto.spec;
|
||||||
using Org.BouncyCastle.Crypto;
|
|
||||||
using Org.BouncyCastle.Crypto.Parameters;
|
|
||||||
|
|
||||||
namespace MinecraftClient
|
namespace MinecraftClient
|
||||||
{
|
{
|
||||||
|
|
@ -27,9 +25,9 @@ namespace MinecraftClient
|
||||||
|
|
||||||
public static SecretKey GenerateAESPrivateKey()
|
public static SecretKey GenerateAESPrivateKey()
|
||||||
{
|
{
|
||||||
CipherKeyGenerator var0 = new CipherKeyGenerator();
|
AesManaged aes = new AesManaged();
|
||||||
var0.Init(new KeyGenerationParameters(new Org.BouncyCastle.Security.SecureRandom(), 128));
|
aes.KeySize = 128; aes.GenerateKey();
|
||||||
return new SecretKeySpec(var0.GenerateKey(), "AES");
|
return new SecretKeySpec(aes.Key, "AES");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static byte[] getServerHash(String toencode, PublicKey par1PublicKey, SecretKey par2SecretKey)
|
public static byte[] getServerHash(String toencode, PublicKey par1PublicKey, SecretKey par2SecretKey)
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,6 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="resources\appicon.ico" />
|
<Content Include="resources\appicon.ico" />
|
||||||
<Content Include="lib\BouncyCastle.Crypto.dll" />
|
|
||||||
<Content Include="lib\IKVM.OpenJDK.Core.dll" />
|
<Content Include="lib\IKVM.OpenJDK.Core.dll" />
|
||||||
<Content Include="lib\IKVM.OpenJDK.Security.dll" />
|
<Content Include="lib\IKVM.OpenJDK.Security.dll" />
|
||||||
<Content Include="lib\IKVM.OpenJDK.Util.dll" />
|
<Content Include="lib\IKVM.OpenJDK.Util.dll" />
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
||||||
<StartArguments>
|
<StartArguments>TestBot - localhost</StartArguments>
|
||||||
</StartArguments>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -33,8 +33,8 @@ namespace MinecraftClient
|
||||||
//Hangman Settings
|
//Hangman Settings
|
||||||
public static bool Hangman_Enabled = false;
|
public static bool Hangman_Enabled = false;
|
||||||
public static bool Hangman_English = true;
|
public static bool Hangman_English = true;
|
||||||
public static string Hangman_FileWords_EN = "words.txt";
|
public static string Hangman_FileWords_EN = "hangman-en.txt";
|
||||||
public static string Hangman_FileWords_FR = "mots.txt";
|
public static string Hangman_FileWords_FR = "hangman-fr.txt";
|
||||||
|
|
||||||
//Alerts Settings
|
//Alerts Settings
|
||||||
public static bool Alerts_Enabled = false;
|
public static bool Alerts_Enabled = false;
|
||||||
|
|
@ -193,7 +193,7 @@ namespace MinecraftClient
|
||||||
|
|
||||||
public static void WriteDefaultSettings(string settingsfile)
|
public static void WriteDefaultSettings(string settingsfile)
|
||||||
{
|
{
|
||||||
System.IO.File.WriteAllText(settingsfile, "#Minecraft Console Client v" + Program.Version + "\r\n#Startup Config File\r\n\r\n[Main]\r\n\r\n#General settings\r\n#leave blank = prompt user on startup\r\n#Use \"-\" as password for offline mode\r\n\r\nlogin=\r\npassword=\r\nserverip=\r\n\r\n#Advanced settings\r\n\r\ntranslationsfile=translations.lang\r\nbotownersfile=bot-owners.txt\r\nconsoletitle=Minecraft Console Client\r\n\r\n#Bot Settings\r\n\r\n[Alerts]\r\nenabled=false\r\nalertsfile=alerts.txt\r\nexcludesfile=alerts-exclude.txt\r\n\r\n[AntiAFK]\r\nenabled=false\r\ndelay=600 #10 = 1s\r\n\r\n[AutoRelog]\r\nenabled=false\r\ndelay=10\r\nretries=3\r\nkickmessagesfile=kickmessages.txt\r\n\r\n[ChatLog]\r\nenabled=false\r\ntimestamps=true\r\nfilter=messages\r\nlogfile=chatlog.txt\r\n\r\n[Hangman]\r\nenabled=false\r\nenglish=true\r\nwordsfile=words.txt\r\nfichiermots=mots.txt\r\n\r\n[Scripting]\r\nenabled=false\r\nscriptfile=testscript.txt\r\n");
|
System.IO.File.WriteAllText(settingsfile, "#Minecraft Console Client v" + Program.Version + "\r\n#Startup Config File\r\n\r\n[Main]\r\n\r\n#General settings\r\n#leave blank = prompt user on startup\r\n#Use \"-\" as password for offline mode\r\n\r\nlogin=\r\npassword=\r\nserverip=\r\n\r\n#Advanced settings\r\n\r\ntranslationsfile=translations.lang\r\nbotownersfile=bot-owners.txt\r\nconsoletitle=Minecraft Console Client\r\n\r\n#Bot Settings\r\n\r\n[Alerts]\r\nenabled=false\r\nalertsfile=alerts.txt\r\nexcludesfile=alerts-exclude.txt\r\n\r\n[AntiAFK]\r\nenabled=false\r\ndelay=600 #10 = 1s\r\n\r\n[AutoRelog]\r\nenabled=false\r\ndelay=10\r\nretries=3 #-1 = unlimited\r\nkickmessagesfile=kickmessages.txt\r\n\r\n[ChatLog]\r\nenabled=false\r\ntimestamps=true\r\nfilter=messages\r\nlogfile=chatlog.txt\r\n\r\n[Hangman]\r\nenabled=false\r\nenglish=true\r\nwordsfile=hangman-en.txt\r\nfichiermots=hangman-fr.txt\r\n\r\n[Scripting]\r\nenabled=false\r\nscriptfile=testscript.txt\r\n", Encoding.UTF8);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int str2int(string str) { try { return Convert.ToInt32(str); } catch { return 0; } }
|
public static int str2int(string str) { try { return Convert.ToInt32(str); } catch { return 0; } }
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue