FIX: MSVC compile and item gui on desktop

CMakeLists.txt

@@ -5,7 +5,10 @@ include(cmake/CPM.cmake)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "-Wno-c++11-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal")
+endif()
 
 CPMAddPackage("gh:madler/zlib@1.3.2")
 CPMAddPackage(

README.md

@@ -8,6 +8,9 @@ First of all I made it build with CMake (w/o VS2012). Also I fixed some compile
 - [x] Add platform GLFW
 - [x] Compile for Linux
 - [ ] Compile for android aarch64
+- [ ] Rewrite platform logic
+- [ ] Fix sound
+- [ ] Do a server connection gui
 
 # Build
 ## CMake

src/client/Minecraft.cpp

@@ -665,7 +665,12 @@ void Minecraft::tickInput() {
 
 		if (e.action == MouseAction::ACTION_WHEEL) {
 			Inventory* v = player->inventory;
-			int numSlots = gui.getNumSlots() - 1;
+
+			int numSlots = gui.getNumSlots();
+#ifndef PLATFORM_DESKTOP
+			numSlots--;
+#endif
+
 			int slot = (v->selected - e.dy + numSlots) % numSlots;
 			v->selectSlot(slot);
 		}

src/client/Options.cpp

@@ -55,7 +55,7 @@ void Options::initDefaultValues() {
 	keyBuild = KeyMapping("key.inventory", Keyboard::KEY_E);
 	keySneak = KeyMapping("key.sneak", Keyboard::KEY_LSHIFT);
 #ifndef RPI
-	keyCraft = KeyMapping("key.crafting", Keyboard::KEY_Q);
+	// keyCraft = KeyMapping("key.crafting", Keyboard::KEY_Q);
 	keyDrop  = KeyMapping("key.drop", Keyboard::KEY_Q);
 	keyChat  = KeyMapping("key.chat", Keyboard::KEY_T);
 	keyFog   = KeyMapping("key.fog", Keyboard::KEY_F);

src/client/gui/Gui.cpp

@@ -1,5 +1,6 @@
 #include "Gui.h"
 #include "Font.h"
+#include "client/Options.h"
 #include "screens/IngameBlockSelectionScreen.h"
 #include "../Minecraft.h"
 #include "../player/LocalPlayer.h"
@@ -106,12 +107,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 
 	renderToolBar(a, ySlot, screenWidth);
 
-
-	//font->drawShadow(APP_NAME, 2, 2, 0xffffffff);
-	//font->drawShadow("This is a demo, not the finished product", 2, 10 + 2, 0xffffffff);
-	#ifdef APPLE_DEMO_PROMOTION
-		font->drawShadow("Demo version", 2, 0 + 2, 0xffffffff);
-	#endif /*APPLE_DEMO_PROMOTION*/
 	glEnable(GL_BLEND);
 	unsigned int max = 10;
     bool isChatting = false;
@@ -123,9 +118,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 	renderDebugInfo();
 #endif
 
-//        glPopMatrix2();
-//
-//        glEnable(GL_ALPHA_TEST);
     glDisable(GL_BLEND);
 	glEnable2(GL_ALPHA_TEST);
 }
@@ -188,11 +180,13 @@ void Gui::handleClick(int button, int x, int y) {
 	int slot = getSlotIdAt(x, y);
 	if (slot != -1)
 	{
+#ifndef PLATFORM_DESKTOP
 		if (slot == (getNumSlots()-1))
 		{
 			minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
 		}
 		else
+#endif
 		{
 			minecraft->player->inventory->selectSlot(slot);
 			itemNameOverlayTime = 0;
@@ -220,6 +214,10 @@ void Gui::handleKeyPressed(int key)
 	{
 		minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
 	}
+	else if (key == minecraft->options.keyDrop.key) 
+	{
+		minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
+	}
 }
 
 void Gui::tick() {
@@ -395,6 +393,7 @@ void Gui::onConfigChanged( const Config& c ) {
 		//LOGI("x,y: %f, %f\n", xx, yy);
 	}
 	rcFeedbackInner = t.end(true, rcFeedbackInner.vboId);
+
 	if (c.minecraft->useTouchscreen()) {
 		// I'll bump this up to 6.
 		int num = 6; // without "..." dots
@@ -452,9 +451,16 @@ void Gui::tickItemDrop()
 	// Handle item drop
 	static bool isCurrentlyActive = false;
 	isCurrentlyActive = false;
+
+	int slots = getNumSlots();
+
+#ifndef PLATFORM_DESKTOP
+	slots--;
+#endif
+
 	if (Mouse::isButtonDown(MouseAction::ACTION_LEFT)) {
 		int slot = getSlotIdAt(Mouse::getX(), Mouse::getY());
-		if (slot >= 0 && slot < getNumSlots()-1) {
+		if (slot >= 0 && slot < slots) {
 			if (slot != _currentDropSlot) {
 				_currentDropTicks = 0;
 				_currentDropSlot = slot;
@@ -756,20 +762,24 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	t.beginOverride();
 
 	float x = baseItemX;
-	for (int i = 0; i < getNumSlots()-1; i++) {
+
+	int slots = getNumSlots();
+
+	// TODO: if using touchscreen
+
+#ifndef PLATFORM_DESKTOP
+	slots--;
+#endif
+
+	for (int i = 0; i < slots; i++) {
 		renderSlot(i, (int)x, ySlot, a);
 		x += 20;
 	}
 	_inventoryNeedsUpdate = false;
-	//_inventoryRc = t.end(_inventoryRc.vboId);
 
-	//drawArrayVTC(_inventoryRc.vboId, _inventoryRc.vertexCount);
+#ifndef PLATFORM_DESKTOP
-
-	//renderSlotWatch.stop();
-	//renderSlotWatch.printEvery(100, "Render slots:");
-
-	//int x = screenWidth / 2 + getNumSlots() * 10 + (getNumSlots()-1) * 20 + 2;
 	blit(screenWidth / 2 + 10 * getNumSlots() - 20 + 4, ySlot + 6, 242, 252, 14, 4, 14, 4);
+#endif
 
 	minecraft->textures->loadAndBindTexture("gui/gui_blocks.png");
 	t.endOverrideAndDraw();
@@ -779,7 +789,7 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	glDisable2(GL_TEXTURE_2D);
 	t.beginOverride();
 	x = baseItemX;
-	for (int i = 0; i < getNumSlots()-1; i++) {
+	for (int i = 0; i < slots; i++) {
 		ItemRenderer::renderGuiItemDecorations(minecraft->player->inventory->getItem(i), x, (float)ySlot);
 		x += 20;
 	}
@@ -799,7 +809,7 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	t.beginOverride();
 	if (minecraft->gameMode->isSurvivalType()) {
 		x = baseItemX;
-		for (int i = 0; i < getNumSlots()-1; i++) {
+		for (int i = 0; i < slots; i++) {
 			ItemInstance* item = minecraft->player->inventory->getItem(i);
 			if (item && item->count >= 0)
 				renderSlotText(item, k*x, k*ySlot + 1, true, true);