Added Tile Entities

GameMods.hpp

@@ -21,6 +21,7 @@
 // Features (major changes)
 //#define FEATURE_GFX_SHADERS 	           // Loads and uses Shaders from the assets folder for rendering.
 #define FEATURE_NETWORKING                 // Enables multi-player through RakNet
+//#define FEATURE_SERVER_INVENTORIES       // Enables server-sided/server-authoritative player inventories.
 
 // TODO: Add to the LevelSettings struct
 //#define FEATURE_CAVES 	               // Generates caves around the world.

game/assets/lang/en_US.lang

@@ -104,6 +104,7 @@ options.guiScale.small=Small
 options.guiScale.normal=Normal
 options.guiScale.large=Large
 options.gamma=Gamma
+options.enableVsync=V-Sync
 
 performance.max=Max FPS
 performance.balanced=Balanced

platforms/android/AppPlatform_android.cpp

@@ -117,6 +117,20 @@ std::string AppPlatform_android::getDateString(int time)
 	return std::string(buffer);
 }
 
+void AppPlatform_android::setVSyncEnabled(bool enabled)
+{
+	EGLDisplay display = eglGetCurrentDisplay();
+	if (display == EGL_NO_DISPLAY)
+		return;
+
+	eglSwapInterval(display, enabled ? 1 : 0);
+}
+
+bool AppPlatform_android::isVSyncSwitchable() const
+{
+	return eglGetCurrentDisplay() != EGL_NO_DISPLAY;
+}
+
 SoundSystem* AppPlatform_android::getSoundSystem() const
 {
 	return m_pSoundSystem;

platforms/android/AppPlatform_android.hpp

@@ -29,6 +29,8 @@ class AppPlatform_android : public AppPlatform
 	int getScreenHeight() const override;
 	void showDialog(eDialogType) override;
 	std::string getDateString(int time) override;
+	void setVSyncEnabled(bool enabled) override;
+	bool isVSyncSwitchable() const override;
 
 	// Also add these to allow proper turning within the game.
 	void recenterMouse() override;

platforms/sdl/sdl2/main.cpp

@@ -62,16 +62,11 @@ static void initGraphics()
 		exit(EXIT_FAILURE);
 	}
 
-    // Enable V-Sync
-    // Not setting this explicitly results in undefined behavior
-    if (SDL_GL_SetSwapInterval(-1) == -1) // Try adaptive
+    // Vsync is controlled through the AppPlatform,
+    // default to no vsync here, let platform set it when needed
+    if (SDL_GL_SetSwapInterval(0) == -1)
     {
-        LOG_W("Adaptive V-Sync is not supported on this platform. Falling back to standard V-Sync...");
-        // fallback to standard
-		if (SDL_GL_SetSwapInterval(1) == -1)
-		{
-			LOG_W("Setting the swap interval for V-Sync is not supported on this platform!");
-		}
+        LOG_W("Setting the swap interval is not supported on this platform!");
     }
 
 	if (!mce::Platform::OGL::InitBindings())
@@ -440,6 +435,7 @@ int main(int argc, char *argv[])
 	// Start MCPE
 	g_pAppPlatform = new UsedAppPlatform(storagePath, window);
 	g_pAppPlatform->m_externalStorageDir = storagePath;
+	g_pAppPlatform->setVSyncEnabled(true);
 	g_pApp = new NinecraftApp;
 	g_pApp->m_pPlatform = g_pAppPlatform;
 	g_pApp->init();

platforms/windows/AppPlatform_win32.cpp

@@ -135,21 +135,6 @@ void AppPlatform_win32::showDialog(eDialogType type)
 	m_DialogType = type;
 }
 
-std::string AppPlatform_win32::getDateString(int time)
-{
-	time_t tt = time;
-	struct tm t;
-	// using the _s variant. For a different platform there's gmtime_r. This is not directly portable however.
-	gmtime_s(&t, &tt);
-
-	//format it with strftime
-	char buf[2048];
-	strftime(buf, sizeof buf, "%b %d %Y %H:%M:%S", &t);
-	//strftime(buf, sizeof buf, "%a %b %d %H:%M:%S %Z %Y", &t);
-
-	return std::string(buf);
-}
-
 bool AppPlatform_win32::doesTextureExist(const std::string& path) const
 {
 	return isRegularFile(path.c_str());
@@ -460,6 +445,22 @@ bool AppPlatform_win32::initGraphics(int width, int height)
 	return true;
 }
 
+void AppPlatform_win32::setVSyncEnabled(bool enabled)
+{
+#if MCE_GFX_API_OGL
+	xglSwapIntervalEXT(enabled ? 1 : 0);
+#endif
+}
+
+bool AppPlatform_win32::isVSyncSwitchable() const
+{
+#if MCE_GFX_API_OGL
+	return true;
+#else
+	return false;
+#endif
+}
+
 void AppPlatform_win32::createWindowSizeDependentResources(const Vec2& logicalSize, const Vec2& compositionScale)
 {
 #if MCE_GFX_API_D3D9

platforms/windows/AppPlatform_win32.hpp

@@ -37,7 +37,6 @@ class AppPlatform_win32 : public AppPlatform
 	int getScreenWidth() const override { return m_ScreenWidth; }
 	int getScreenHeight() const override { return m_ScreenHeight; }
 	void showDialog(eDialogType) override;
-	std::string getDateString(int time) override;
 	bool doesTextureExist(const std::string& path) const override;
 
 	// From v0.1.1. Also add these to determine touch screen use within the game.
@@ -82,6 +81,8 @@ class AppPlatform_win32 : public AppPlatform
 	bool initGraphics(int width, int height);
 	void createWindowSizeDependentResources(const Vec2& logicalSize, const Vec2& compositionScale);
 	void swapBuffers();
+	void setVSyncEnabled(bool enabled) override;
+	bool isVSyncSwitchable() const override;
 
 	static MouseButtonType GetMouseButtonType(UINT iMsg);
 	static bool GetMouseButtonState(UINT iMsg, WPARAM wParam);

platforms/windows/main.cpp

@@ -152,6 +152,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	if (!g_AppPlatform.initGraphics(Minecraft::width, Minecraft::height))
 		goto _cleanup;
 
+	g_AppPlatform.setVSyncEnabled(true);
+
 	g_pApp = new NinecraftApp;
 	g_pApp->m_pPlatform = &g_AppPlatform;
 

platforms/xdk360/AppPlatform_xdk360.cpp

@@ -123,21 +123,6 @@ int AppPlatform_xdk360::checkLicense()
 	return 1;
 }
 
-std::string AppPlatform_xdk360::getDateString(int time)
-{
-	time_t tt = time;
-	struct tm t;
-	// using the _s variant. For a different platform there's gmtime_r. This is not directly portable however.
-	gmtime_s(&t, &tt);
-
-	//format it with strftime
-	char buf[2048];
-	strftime(buf, sizeof buf, "%b %d %Y %H:%M:%S", &t);
-	//strftime(buf, sizeof buf, "%a %b %d %H:%M:%S %Z %Y", &t);
-
-	return std::string(buf);
-}
-
 bool AppPlatform_xdk360::isTouchscreen() const
 {
 	return false;

platforms/xdk360/AppPlatform_xdk360.hpp

@@ -24,7 +24,6 @@ class AppPlatform_xdk360 : public AppPlatform
 	int checkLicense() override;
 	int getScreenWidth() const override { return m_ScreenWidth; }
 	int getScreenHeight() const override { return m_ScreenHeight; }
-	std::string getDateString(int time) override;
 
 	// From v0.1.1. Also add these to determine touch screen use within the game.
 	bool isTouchscreen() const override;

projects/visual-studio/Client/Client.vcxproj

@@ -258,6 +258,7 @@
     <ClInclude Include="$(MC_ROOT)\source\client\gui\ScreenChooser.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\client\resources\LoadingTipManager.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\client\resources\SplashManager.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\client\gui\screens\inventory\FurnaceScreen.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MC_ROOT)\source\client\app\App.cpp" />
@@ -434,6 +435,7 @@
     <ClCompile Include="$(MC_ROOT)\source\client\gui\ScreenChooser.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\client\resources\LoadingTipManager.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\client\resources\SplashManager.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\client\gui\screens\inventory\FurnaceScreen.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.vcxproj">

projects/visual-studio/Client/Client.vcxproj.filters

@@ -677,6 +677,9 @@
     <ClInclude Include="$(MC_ROOT)\source\client\gui\screens\inventory\ClassicCraftingScreen_Console.hpp">
       <Filter>Header Files\GUI\Screens\Inventory</Filter>
     </ClInclude>
+    <ClInclude Include="$(MC_ROOT)\source\client\gui\screens\inventory\FurnaceScreen.hpp">
+      <Filter>Header Files\GUI\Screens\Inventory</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MC_ROOT)\source\client\gui\components\AvailableGamesList.cpp">
@@ -1204,5 +1207,8 @@
     <ClCompile Include="$(MC_ROOT)\source\client\gui\screens\inventory\ClassicCraftingScreen_Console.cpp">
       <Filter>Source Files\GUI\Screens\Inventory</Filter>
     </ClCompile>
+    <ClCompile Include="$(MC_ROOT)\source\client\gui\screens\inventory\FurnaceScreen.cpp">
+      <Filter>Source Files\GUI\Screens\Inventory</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

projects/visual-studio/World/World.vcxproj

@@ -203,15 +203,15 @@
     <ClCompile Include="$(MC_ROOT)\source\world\entity\Zombie.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\entity\EntityFactory.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\level\levelgen\chunk\DataLayer.cpp" />
-    <ClCompile Include="$(MC_ROOT)\source\world\ContainerListener.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\inventory\ContainerListener.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\ContainerMenu.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\Slot.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\ArmorSlot.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\CraftingContainer.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\InventoryMenu.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\ResultContainer.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\ResultSlot.cpp" />
-    <ClCompile Include="$(MC_ROOT)\source\world\CompoundContainer.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\inventory\CompoundContainer.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\SimpleContainer.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\inventory\ChestMenu.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\item\DyeColor.cpp" />
@@ -230,6 +230,21 @@
     <ClCompile Include="$(MC_ROOT)\source\world\item\WeaponItem.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\item\DyePowderItem.cpp" />
     <ClCompile Include="$(MC_ROOT)\source\world\item\CoalItem.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\Facing.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\inventory\FurnaceMenu.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\inventory\FurnaceResultSlot.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\particle\NoteParticle.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\ChestTile.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\EntityTile.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\entity\ChestTileEntity.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\entity\FurnaceTileEntity.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\entity\MusicTileEntity.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\entity\TileEntity.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\entity\TileEntityType.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\FurnaceTile.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\tile\MusicTile.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\inventory\ContainerContentChangeListener.cpp" />
+    <ClCompile Include="$(MC_ROOT)\source\world\inventory\ContainerSizeChangeListener.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MC_ROOT)\source\world\entity\Entity.hpp" />
@@ -373,16 +388,16 @@
     <ClInclude Include="$(MC_ROOT)\source\world\level\levelgen\chunk\DataLayer.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\level\TileChange.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\level\LevelEvent.hpp" />
-    <ClInclude Include="$(MC_ROOT)\source\world\Container.hpp" />
-    <ClInclude Include="$(MC_ROOT)\source\world\ContainerListener.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\inventory\Container.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\inventory\ContainerListener.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\ContainerMenu.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\Slot.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\ArmorSlot.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\CraftingContainer.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\InventoryMenu.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\ResultContainer.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\ResultSlot.hpp" />
-    <ClInclude Include="$(MC_ROOT)\source\world\CompoundContainer.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\inventory\CompoundContainer.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\SimpleContainer.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\inventory\ChestMenu.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\item\DyeColor.hpp" />
@@ -400,6 +415,19 @@
     <ClInclude Include="$(MC_ROOT)\source\world\item\WeaponItem.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\item\DyePowderItem.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\item\CoalItem.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\inventory\FurnaceMenu.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\inventory\FurnaceResultSlot.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\ChestTile.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\EntityTile.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\entity\ChestTileEntity.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\entity\FurnaceTileEntity.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\entity\MusicTileEntity.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\entity\TileEntity.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\entity\TileEntityType.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\FurnaceTile.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\tile\MusicTile.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\inventory\ContainerContentChangeListener.hpp" />
+    <ClInclude Include="$(MC_ROOT)\source\world\inventory\ContainerSizeChangeListener.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NBT\NBT.vcxproj">