Fix launcher not compiling, oops

This commit is contained in:
UnknownShadow200 2018-10-08 12:30:09 +11:00
parent 0e031d3886
commit dc48fd9e6e
4 changed files with 12 additions and 9 deletions

View File

@ -179,7 +179,7 @@ namespace ClassicalSharp {
return value; return value;
} }
static bool UnHex(char hex, out int value) { internal static bool UnHex(char hex, out int value) {
value = 0; value = 0;
if (hex >= '0' && hex <= '9') { if (hex >= '0' && hex <= '9') {
value = (hex - '0'); value = (hex - '0');

View File

@ -18,7 +18,7 @@ It **does not** work with 'modern/premium' Minecraft servers.
#### Requirements #### Requirements
* Windows: .NET framework 2.0 or Mono. (Vista and later have .NET framework 2.0 built in) * Windows: .NET framework 2.0 or Mono. (Vista and later have .NET framework 2.0 built in)
ClassicalSharp has been verified to work on Windows 2000 and later. The OpenGL build has been verified to work in a Windows 98 virtual machine, however has not been tested on real hardware running Windows 98. ClassicalSharp has been verified to work on Windows 2000 and later. The OpenGL 1.1 build has been verified to work in a Windows 98 virtual machine, however has not been tested on real hardware running Windows 98.
* Linux and Mac OSX: Either Wine or Mono. * Linux and Mac OSX: Either Wine or Mono.
#### Instructions #### Instructions
@ -26,26 +26,28 @@ Initially, you will need to run launcher.exe to download the required assets fro
Just click 'OK' to the dialog menu that appears when you start the launcher. Just click 'OK' to the dialog menu that appears when you start the launcher.
**Singleplayer** **Singleplayer**
Run classicalsharp.exe. Run ClassicalSharp.exe.
**Multiplayer** **Multiplayer**
Run launcher.exe. You can connect to LAN/locally hosted servers, ~~minecraft.net servers,~~ and classicube.net servers through the launcher. Run Launcher.exe. You can connect to LAN/locally hosted servers, ~~minecraft.net servers,~~ and classicube.net servers through the launcher.
###### *Mono specific* ###### *Mono specific*
*If you are using Wine, you need to mark both ClassicalSharp.exe and Launcher.exe as executable, then type this into the terminal: `./Launcher.exe` *If you are using Wine, you need to mark both ClassicalSharp.exe and Launcher.exe as executable, then type this into the terminal: `./Launcher.exe`
If you are using Mono, you just need to type `mono Launcher.exe` into the terminal.* If you are using Mono, you just need to type `mono Launcher.exe` into the terminal.*
*Also when using older mono versions, you may need to run `mozroots --import --sync` to import trusted root certificates, otherwise you will get an 'Error writing headers' exception.* *You may get TrustFailure/SendFailure errors trying to download https:// texture packs, [see here](https://github.com/duplicati/duplicati/wiki/SSL-TLS-support-in-Mono) for how to fix.*
*For wine, you'll need to navigate to the internal folder of mono (usually ~/.wine/drive_c/windows/mono/mono-2.0/lib/mono/4.5/), and use say 'wine mozroots.exe' instead.*
###### *Windows specific* ###### *Windows specific*
*If you are stuck using the built-in OpenGL 1.1 software renderer, you can use the MESA software renderer from either [here](http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/) or [here](https://wiki.qt.io/Cross_compiling_Mesa_for_Windows) for slightly better performance. Typically though, this occurs because you have not installed GPU drivers.* *If you are stuck using the built-in OpenGL 1.1 software renderer, you can use the MESA software renderer from either [here](http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/) or [here](https://wiki.qt.io/Cross_compiling_Mesa_for_Windows) for slightly better performance. Typically though, this occurs because you have not installed GPU drivers.*
#### Tips #### Tips
* Press escape (after joining a world) or pause to switch to the pause menu. * Press escape (after joining a world) or pause to switch to the pause menu.
* Pause menu -> Key bindings lists all of the key combinations used by the client. * Pause menu -> Options -> Controls lists all of the key combinations used by the client.
* Note that toggling 'vsync' to on will minimise CPU usage, while off will maximimise chunk loading speed. * Note that toggling 'vsync' to on will minimise CPU usage, while off will maximimise chunk loading speed.
* Press F to cycle view distance. A smaller number of visible chunks can improve performance. * Press F to cycle view distance. A smaller number of visible chunks can improve performance.
* If the server has disabled hacks, key combinations such as fly and speed will not do anything. * If the server has disabled hacks, key combinations such as fly and speed will not do anything.
* To see a list of all built in commands, type `/client commands`. * To see the list of built in commands, type `/client`.
* To see help for a given built in command, type `/client help <command name>`. * To see help for a given built in command, type `/client help <command name>`.

View File

@ -37,7 +37,7 @@ void PackedCol_GetShaded(PackedCol normal, PackedCol* xSide, PackedCol* zSide, P
*yMin = PackedCol_Scale(normal, PACKEDCOL_SHADE_YMIN); *yMin = PackedCol_Scale(normal, PACKEDCOL_SHADE_YMIN);
} }
NOINLINE_ static bool PackedCol_Unhex(char hex, int* value) { bool PackedCol_Unhex(char hex, int* value) {
*value = 0; *value = 0;
if (hex >= '0' && hex <= '9') { if (hex >= '0' && hex <= '9') {
*value = (hex - '0'); *value = (hex - '0');

View File

@ -29,6 +29,7 @@ PackedCol PackedCol_Create3(uint8_t r, uint8_t g, uint8_t b);
uint32_t PackedCol_ToARGB(PackedCol col); uint32_t PackedCol_ToARGB(PackedCol col);
PackedCol PackedCol_Scale(PackedCol value, float t); PackedCol PackedCol_Scale(PackedCol value, float t);
PackedCol PackedCol_Lerp(PackedCol a, PackedCol b, float t); PackedCol PackedCol_Lerp(PackedCol a, PackedCol b, float t);
NOINLINE_ bool PackedCol_Unhex(char hex, int* value);
NOINLINE_ void PackedCol_ToHex(String* str, PackedCol value); NOINLINE_ void PackedCol_ToHex(String* str, PackedCol value);
NOINLINE_ bool PackedCol_TryParseHex(const String* str, PackedCol* value); NOINLINE_ bool PackedCol_TryParseHex(const String* str, PackedCol* value);