New Mod System

5 files changed, 49 insertions, 11 deletions

diff --git a/src/client/game.cpp b/src/client/game.cpp
index d983e2bb8..663fbd672 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1071,8 +1071,8 @@ void Game::processKeyInput()
 			toggleAutoforward();
 	} else if (wasKeyDown(KeyType::INVENTORY)) {
 		openInventory();
-	} else if (wasKeyDown(KeyType::SPECIAL_INVENTORY)) {
-		openSpecialInventory();
+	} else if (wasKeyDown(KeyType::ENDERCHEST)) {
+		openEnderchest();
 	} else if (input->cancelPressed()) {
 #ifdef __ANDROID__
 		m_android_chat_open = false;
@@ -1105,6 +1105,10 @@ void Game::processKeyInput()
 		toggleKillaura();
 	} else if (wasKeyDown(KeyType::FREECAM)) {
 		toggleFreecam();
+	} else if (wasKeyDown(KeyType::SCAFFOLD)) {
+		toggleScaffold();
+	} else if (wasKeyDown(KeyType::NEXT_ITEM)) {
+		toggleNextItem();
 	} else if (wasKeyDown(KeyType::SELECT_UP)) {
 		m_cheat_menu->selectUp();
 	} else if (wasKeyDown(KeyType::SELECT_DOWN)) {
@@ -1285,7 +1289,7 @@ void Game::openInventory()
 	}
 }
 
-void Game::openSpecialInventory()
+void Game::openEnderchest()
 {
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
 	if (!player || !player->getCAO())
@@ -1294,7 +1298,7 @@ void Game::openSpecialInventory()
 	infostream << "Game: Launching special inventory" << std::endl;
 
 	if (client->modsLoaded())
-		client->getScript()->open_special_inventory();
+		client->getScript()->open_enderchest();
 }
 
 
@@ -1428,6 +1432,30 @@ void Game::toggleFreecam()
 	}
 }
 
+void Game::toggleScaffold()
+{
+	bool scaffold = ! g_settings->getBool("scaffold");
+	g_settings->set("scaffold", bool_to_cstr(scaffold));
+
+	if (scaffold) {
+		m_game_ui->showTranslatedStatusText("Scaffold enabled");
+	} else {
+		m_game_ui->showTranslatedStatusText("Scaffold disabled");
+	}
+}
+
+void Game::toggleNextItem()
+{
+	bool next_item = ! g_settings->getBool("next_item");
+	g_settings->set("next_item", bool_to_cstr(next_item));
+
+	if (next_item) {
+		m_game_ui->showTranslatedStatusText("NextItem enabled");
+	} else {
+		m_game_ui->showTranslatedStatusText("NextItem disabled");
+	}
+}
+
 void Game::toggleCinematic()
 {
 	bool cinematic = !g_settings->getBool("cinematic");
@@ -3432,7 +3460,7 @@ void Game::showPauseMenu()
 		"- %s: sneak/go down\n"
 		"- %s: drop item\n"
 		"- %s: inventory\n"
-		"- %s: special inventory\n"
+		"- %s: enderchest\n"
 		"- Mouse: turn/look\n"
 		"- Mouse left: dig/punch\n"
 		"- Mouse right: place/use\n"
@@ -3440,6 +3468,8 @@ void Game::showPauseMenu()
 		"- %s: chat\n"
 		"- %s: Killaura\n"
 		"- %s: Freecam\n"
+		"- %s: Scaffold\n"
+		"- %s: NextItem\n"
 	);
 
 	 char control_text_buf[600];
@@ -3453,10 +3483,12 @@ void Game::showPauseMenu()
 			GET_KEY_NAME(keymap_sneak),
 			GET_KEY_NAME(keymap_drop),
 			GET_KEY_NAME(keymap_inventory),
-			GET_KEY_NAME(keymap_special_inventory),
+			GET_KEY_NAME(keymap_enderchest),
 			GET_KEY_NAME(keymap_chat),
 			GET_KEY_NAME(keymap_toggle_killaura),
-			GET_KEY_NAME(keymap_toggle_freecam)
+			GET_KEY_NAME(keymap_toggle_freecam),
+			GET_KEY_NAME(keymap_toggle_scaffold),
+			GET_KEY_NAME(keymap_toggle_next_item)
 			);
 
 	std::string control_text = std::string(control_text_buf);
diff --git a/src/client/game.h b/src/client/game.h
index a2a1e7c2d..b8efa3a73 100644
--- a/src/client/game.h
+++ b/src/client/game.h
@@ -724,7 +724,7 @@ public:
 
 	void dropSelectedItem(bool single_item = false);
 	void openInventory();
-	void openSpecialInventory();
+	void openEnderchest();
 	void openConsole(float scale, const wchar_t *line=NULL);
 	void toggleFreeMove();
 	void toggleFreeMoveAlt();
@@ -733,6 +733,8 @@ public:
 	void toggleNoClip();
 	void toggleKillaura();
 	void toggleFreecam();
+	void toggleScaffold();
+	void toggleNextItem();
 	void toggleCinematic();
 	void toggleAutoforward();
 
diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index edf2056d0..418e41931 100644
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -42,7 +42,7 @@ void KeyCache::populate()
 
 	key[KeyType::DROP] = getKeySetting("keymap_drop");
 	key[KeyType::INVENTORY] = getKeySetting("keymap_inventory");
-	key[KeyType::SPECIAL_INVENTORY] = getKeySetting("keymap_special_inventory");
+	key[KeyType::ENDERCHEST] = getKeySetting("keymap_enderchest");
 	key[KeyType::CHAT] = getKeySetting("keymap_chat");
 	key[KeyType::CMD] = getKeySetting("keymap_cmd");
 	key[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local");
@@ -75,6 +75,8 @@ void KeyCache::populate()
 	key[KeyType::ZOOM] = getKeySetting("keymap_zoom");
 	key[KeyType::KILLAURA] = getKeySetting("keymap_toggle_killaura");
 	key[KeyType::FREECAM] = getKeySetting("keymap_toggle_freecam");
+	key[KeyType::SCAFFOLD] = getKeySetting("keymap_toggle_scaffold");
+	key[KeyType::NEXT_ITEM] = getKeySetting("keymap_toggle_next_item");
 	key[KeyType::SELECT_UP] = getKeySetting("keymap_select_up");
 	key[KeyType::SELECT_DOWN] = getKeySetting("keymap_select_down");
 	key[KeyType::SELECT_LEFT] = getKeySetting("keymap_select_left");
diff --git a/src/client/keys.h b/src/client/keys.h
index b29e232fd..43a032a7b 100644
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -41,7 +41,7 @@ public:
 		// Other
 		DROP,
 		INVENTORY,
-		SPECIAL_INVENTORY,
+		ENDERCHEST,
 		CHAT,
 		CMD,
 		CMD_LOCAL,
@@ -72,6 +72,8 @@ public:
 		ZOOM,
 		KILLAURA,
 		FREECAM,
+		SCAFFOLD,
+		NEXT_ITEM,
 		SELECT_UP,
 		SELECT_DOWN,
 		SELECT_LEFT,
diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 45fc0d8ec..223af5142 100644
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -69,7 +69,7 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min
 	draw_crosshair = _draw_crosshair;
 	draw_tracers = _draw_tracers;
 	draw_esp = _draw_esp;
-
+		
 	beforeDraw();
 	drawAll();
 }