AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of pointless code.

Browse Source
This commit is contained in:
UnknownShadow200 2016-05-20 18:56:04 +10:00
parent 5c05d40d6c
commit 061c7b80b4
4 changed files with 51 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MCGalaxy_.csproj
View File

@ -625,7 +625,6 @@
<Compile Include="queue\MainLoop.cs" /> <Compile Include="queue\MainLoop.cs" />
<Compile Include="util\Extensions.cs" /> <Compile Include="util\Extensions.cs" />
<Compile Include="util\Hasher.cs" /> <Compile Include="util\Hasher.cs" />
<Compile Include="util\ICryptoService.cs" />
<Compile Include="util\MathHelper.cs" /> <Compile Include="util\MathHelper.cs" />
<Compile Include="util\MCForgeScripter.cs" /> <Compile Include="util\MCForgeScripter.cs" />
<Compile Include="Player\Player.CPE.cs" /> <Compile Include="Player\Player.CPE.cs" />

182
util/App.cs
View File

@ -1,19 +1,19 @@
/* /*
Copyright 2010 MCSharp team (Modified for use with MCZall/MCLawl/MCGalaxy) Copyright 2010 MCSharp team (Modified for use with MCZall/MCLawl/MCGalaxy)
Dual-licensed under the Educational Community License, Version 2.0 and Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing, Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS" software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System; using System;
using System.Diagnostics; using System.Diagnostics;
@ -51,7 +51,7 @@ namespace MCGalaxy.Gui
if (wait) { if (!Server.checkUpdates) return; Thread.Sleep(10000); } if (wait) { if (!Server.checkUpdates) return; Thread.Sleep(10000); }
try try
{ {
string raw = Client.DownloadString(CurrentVersionFile); string raw = Client.DownloadString(CurrentVersionFile);
Version availableUpdateVersion = new Version(raw); Version availableUpdateVersion = new Version(raw);
if (availableUpdateVersion > Server.Version) if (availableUpdateVersion > Server.Version)
{ {
@ -134,88 +134,14 @@ namespace MCGalaxy.Gui
updateThread.Start(); updateThread.Start();
} }
public static void PerformUpdate() public static void PerformUpdate() {
{ try {
try try {
{ DeleteFiles("MCLawl.new", "Changelog.txt", "MCGalaxy_.update", "MCGalaxy.update",
//StreamWriter SW; "Update.bat", "Update.sh", "Update_generated.bat", "Update_generated.sh");
//if (!Server.mono) } catch {
//{
// if (!File.Exists("Update.bat"))
// SW = new StreamWriter(File.Create("Update.bat"));
// else
// {
// if (File.ReadAllLines("Update.bat")[0] != "::Version 3")
// {
// SW = new StreamWriter(File.Create("Update.bat"));
// }
// else
// {
// SW = new StreamWriter(File.Create("Update_generated.bat"));
// }
// }
// SW.WriteLine("::Version 3");
// SW.WriteLine("TASKKILL /pid %2 /F");
// SW.WriteLine("if exist MCGalaxy_.dll.backup (erase MCGalaxy_.dll.backup)");
// SW.WriteLine("if exist MCGalaxy_.dll (rename MCGalaxy_.dll MCGalaxy_.dll.backup)");
// SW.WriteLine("if exist MCGalaxy.new (rename MCGalaxy.new MCGalaxy_.dll)");
// SW.WriteLine("start MCGalaxy.exe");
//}
//else
//{
// if (!File.Exists("Update.sh"))
// SW = new StreamWriter(File.Create("Update.sh"));
// else
// {
// if (File.ReadAllLines("Update.sh")[0] != "#Version 2")
// {
// SW = new StreamWriter(File.Create("Update.sh"));
// }
// else
// {
// SW = new StreamWriter(File.Create("Update_generated.sh"));
// }
// }
// SW.WriteLine("#Version 2");
// SW.WriteLine("#!/bin/bash");
// SW.WriteLine("kill $2");
// SW.WriteLine("rm MCGalaxy_.dll.backup");
// SW.WriteLine("mv MCGalaxy_.dll MCGalaxy.dll_.backup");
// SW.WriteLine("wget " + DLLLocation);
// SW.WriteLine("mono MCGalaxy.exe");
//}
//SW.Flush(); SW.Close(); SW.Dispose();
//Process proc = Process.GetCurrentProcess();
//string assemblyname = proc.ProcessName + ".exe";
//WebClient client = new WebClient();
//Server.selectedrevision = client.DownloadString(Program.CurrentVersionFile);
//client.Dispose();
//string verscheck = Server.selectedrevision.TrimStart('r');
//int vers = int.Parse(verscheck.Split('.')[0]);
try
{
if (File.Exists("MCLawl.new"))
File.Delete("MCLawl.new");
if (File.Exists("Changelog.txt"))
File.Delete("Changelog.txt");
if (File.Exists("MCGalaxy_.update"))
File.Delete("MCGalaxy_.update");
if (File.Exists("MCGalaxy.update"))
File.Delete("MCGalaxy.update");
if (File.Exists("Update.bat"))
File.Delete("Update.bat");
if (File.Exists("Update_generated.bat"))
File.Delete("Update_generated.bat");
if (File.Exists("Update.sh"))
File.Delete("Update.sh");
if (File.Exists("Update_generated.sh"))
File.Delete("Update_generated.sh");
} }
catch { }
WebClient Client = new WebClient(); WebClient Client = new WebClient();
Client.DownloadFile(DLLLocation, "MCGalaxy_.update"); Client.DownloadFile(DLLLocation, "MCGalaxy_.update");
Client.DownloadFile(EXELocation, "MCGalaxy.update"); Client.DownloadFile(EXELocation, "MCGalaxy.update");
@ -231,26 +157,29 @@ namespace MCGalaxy.Gui
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) pl.save(); foreach (Player pl in players) pl.save();
if (!usingConsole) if (!usingConsole) {
Process.Start("Updater.exe", "securitycheck10934579068013978427893755755270374" + parent); Process.Start("Updater.exe", "securitycheck10934579068013978427893755755270374" + parent);
else } else {
{
Process.Start("mono", parentfullpathdir + "/Updater.exe securitycheck10934579068013978427893755755270374" + parent); Process.Start("mono", parentfullpathdir + "/Updater.exe securitycheck10934579068013978427893755755270374" + parent);
} }
ExitProgram(false); ExitProgram(false);
} catch (Exception e) {
Server.ErrorLog(e);
}
}
static void DeleteFiles(params string[] files) {
foreach (string f in files) {
if (File.Exists(f)) File.Delete(f);
} }
catch (Exception e) { Server.ErrorLog(e); }
} }
public static void ExitProgram(bool AutoRestart) public static void ExitProgram(bool AutoRestart) {
{
Server.restarting = AutoRestart; Server.restarting = AutoRestart;
Server.shuttingDown = true; Server.shuttingDown = true;
Server.Exit(AutoRestart); Server.Exit(AutoRestart);
new Thread(new ThreadStart(delegate new Thread(new ThreadStart(delegate {
{
/*try /*try
{ {
if (MCGalaxy.Gui.Window.thisWindow.notifyIcon1 != null) if (MCGalaxy.Gui.Window.thisWindow.notifyIcon1 != null)
@ -262,28 +191,21 @@ namespace MCGalaxy.Gui
} }
catch { } catch { }
*/ */
if (AutoRestart) if (AutoRestart) {
{
saveAll(true); saveAll(true);
if (Server.listen != null) Server.listen.Close(); if (Server.listen != null) Server.listen.Close();
if (!usingConsole) if (!usingConsole) {
{
Process.Start(parent); Process.Start(parent);
Environment.Exit(0); Environment.Exit(0);
} } else {
else Process.Start(Application.ExecutablePath);
{
System.Diagnostics.Process.Start(Application.ExecutablePath);
Application.Exit(); Application.Exit();
} }
} } else {
else
{
saveAll(false); saveAll(false);
Application.Exit(); Application.Exit();
if (usingConsole) if (usingConsole) {
{
Process.GetProcessById(Process.GetCurrentProcess().Id).Kill(); Process.GetProcessById(Process.GetCurrentProcess().Id).Kill();
} }
Environment.Exit(0); Environment.Exit(0);
@ -291,25 +213,22 @@ namespace MCGalaxy.Gui
})).Start(); })).Start();
} }
public static void saveAll(bool restarting) public static void saveAll(bool restarting) {
{ try {
try Player[] players = PlayerInfo.Online.Items;
{ foreach (Player p in players) {
Player[] players = PlayerInfo.Online.Items;
foreach (Player p in players)
{
string msg = restarting ? "Server restarted. Sign in again and rejoin." : Server.shutdownMessage; string msg = restarting ? "Server restarted. Sign in again and rejoin." : Server.shutdownMessage;
p.LeaveServer(msg, msg); p.LeaveServer(msg, msg);
} }
} catch (Exception ex) {
Server.ErrorLog(ex);
} }
catch (Exception ex) { Server.ErrorLog(ex); }
try try {
{
string level = null; string level = null;
Level[] loaded = LevelInfo.Loaded.Items; Level[] loaded = LevelInfo.Loaded.Items;
foreach (Level lvl in loaded) { foreach (Level lvl in loaded) {
if (!lvl.ShouldSaveChanges()) continue; if (!lvl.ShouldSaveChanges()) continue;
level = level + lvl.name + "=" + lvl.physics + Environment.NewLine; level = level + lvl.name + "=" + lvl.physics + Environment.NewLine;
lvl.Save(false, true); lvl.Save(false, true);
lvl.saveChanges(); lvl.saveChanges();
@ -318,8 +237,9 @@ namespace MCGalaxy.Gui
if (Server.ServerSetupFinished && !Server.AutoLoad) { if (Server.ServerSetupFinished && !Server.AutoLoad) {
File.WriteAllText("text/autoload.txt", level); File.WriteAllText("text/autoload.txt", level);
} }
} catch (Exception ex) {
Server.ErrorLog(ex);
} }
catch (Exception exc) { Server.ErrorLog(exc); }
} }
} }
} }

3
util/Hasher.cs
View File

@ -73,10 +73,7 @@ namespace MCGalaxy.Util {
if ( hashes.Equals(Encoding.UTF8.GetString(Compute(salt, plainText))) ) { if ( hashes.Equals(Encoding.UTF8.GetString(Compute(salt, plainText))) ) {
return true; return true;
} }
return false; return false;
} }
} }
} }

85
util/ICryptoService.cs
View File

@ -1,85 +0,0 @@
/*
Copyright 2011 MCForge
Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
namespace MCGalaxy.Utils.Crypto {
/// <summary>
/// Interface for Simple Crypto Service
/// </summary>
public interface ICryptoService {
/// <summary>
/// Gets or sets the number of iterations the hash will go through
/// </summary>
int HashIterations { get; set; }
/// <summary>
/// Gets or sets the size of salt that will be generated if no Salt was set
/// </summary>
int SaltSize { get; set; }
/// <summary>
/// Gets or sets the plain text to be hashed
/// </summary>
string PlainText { get; set; }
/// <summary>
/// Gets the base 64 encoded string of the hashed PlainText
/// </summary>
string HashedText { get; }
/// <summary>
/// Gets or sets the salt that will be used in computing the HashedText
/// </summary>
string Salt { get; }
/// <summary>
/// Compute the hash
/// </summary>
/// <returns>the computed hash: HashedText</returns>
string Compute();
/// <summary>
/// Compute the hash using default generated salt
/// </summary>
/// <param name="textToHash"></param>
/// <returns></returns>
string Compute(string textToHash);
/// <summary>
/// Compute the hash that will also generate a salt from parameters
/// </summary>
/// <param name="textToHash">The text to be hashed</param>
/// <param name="saltSize">The size of the salt to be generated</param>
/// <param name="hashIterations"></param>
/// <returns>the computed hash: HashedText</returns>
string Compute(string textToHash, int saltSize, int hashIterations);
/// <summary>
/// Compute the hash that will utilize the passed salt
/// </summary>
/// <param name="textToHash">The text to be hashed</param>
/// <param name="salt">The salt to be used in the computation</param>
/// <returns>the computed hash: HashedText</returns>
string Compute(string textToHash, string salt);
/// <summary>
/// Get the time in milliseconds it takes to complete the hash for the iterations
/// </summary>
/// <param name="iteration"></param>
/// <returns></returns>
int GetElapsedTimeForIteration(int iteration);
}
}