diff --git a/game/assets/.gitignore b/game/assets/.gitignore index 047023a33..d4955a811 100644 --- a/game/assets/.gitignore +++ b/game/assets/.gitignore @@ -1,20 +1,9 @@ #-- The 'game' directory is the default working directory for Minecraft PE if running from VS directly. # Ignore original Minecraft PE assets. -/environment/clouds.png -/font/default.png -/font/default8.png -/gui/feedback.png -/gui/feedback_fill.png -/gui/feedback_outer.png -/gui/background.png /gui/buynow.png -/gui/default_world.png -/gui/gui.png /gui/gui_blocks.png -/gui/icons.png /gui/itemframe.png -/gui/items.png /gui/menubuttons.png /gui/plusknapp.png /gui/raknet.png @@ -28,27 +17,13 @@ /gui/startmenu/sm_multi.png /gui/startmenu/sm_options.png /gui/startmenu/sm_play.png -/item/camera.png /misc/foliagecolor.png /misc/grasscolor.png -/mob/char.png -/mob/chicken.png -/mob/cow.png -/mob/creeper.png -/mob/pig.png /mob/pigzombie.png -/mob/sheep.png -/mob/sheep_fur.png -/mob/skeleton.png -/mob/spider.png -/mob/zombie.png -/particles.png -/terrain.png /gui/buynow.png /gui/controls/dpad.png /gui/controls/dpadbutton.png /gui/controls/dpad_jump.png -/gui/feedback.png /gui/itemframe.png /gui/menubuttons.png /gui/plusknapp.png @@ -57,8 +32,6 @@ /gui/startmenu/sm_multi.png /gui/startmenu/sm_options.png /gui/touchgui.png -/gui/feedback_fill.png -/gui/feedback_outer.png /snow.png # Ignore all native iOS UI assets. /app/ios/ @@ -87,11 +60,8 @@ /music /newmusic # Java -/terrain/sun.png -/terrain/moon.png /misc/vignette.png /misc/shadow.png -/misc/pumpkinblur.png /misc/water.png /environment/rain.png /environment/snow.png @@ -128,4 +98,7 @@ /patches/classic/*.png !/patches/n_rocket_launcher.png !/patches/n_rocket_launched.png -!/patches/n_rocket.png \ No newline at end of file +!/patches/n_rocket.png +!/patches/p_rose.png +!/patches/p_camera.png +!/patches/p_crying_obsidian.png diff --git a/game/assets/app/launch/Default-568h@2x.png b/game/assets/app/launch/Default-568h@2x.png old mode 100755 new mode 100644 diff --git a/game/assets/app/launch/Default-Landscape~ipad.png b/game/assets/app/launch/Default-Landscape~ipad.png old mode 100755 new mode 100644 diff --git a/game/assets/app/launch/Default.png b/game/assets/app/launch/Default.png old mode 100755 new mode 100644 diff --git a/game/assets/app/launch/Default@2x.png b/game/assets/app/launch/Default@2x.png old mode 100755 new mode 100644 diff --git a/game/assets/credits.txt b/game/assets/credits.txt index 8d5d0d4d5..f00c6f5af 100644 --- a/game/assets/credits.txt +++ b/game/assets/credits.txt @@ -5,5 +5,6 @@ TheBrokenRail Un1q32 Vimdo Wilylcaro +Goodly all the other ReMinecraftPE contributors and everyone at Mojang diff --git a/game/assets/environment/clouds.png b/game/assets/environment/clouds.png new file mode 100644 index 000000000..4a5058865 Binary files /dev/null and b/game/assets/environment/clouds.png differ diff --git a/game/assets/font/default.png b/game/assets/font/default.png new file mode 100644 index 000000000..1e6f4e136 Binary files /dev/null and b/game/assets/font/default.png differ diff --git a/game/assets/gui/background.png b/game/assets/gui/background.png new file mode 100644 index 000000000..610964dcb Binary files /dev/null and b/game/assets/gui/background.png differ diff --git a/game/assets/gui/black.png b/game/assets/gui/black.png old mode 100755 new mode 100644 diff --git a/game/assets/gui/default_world.png b/game/assets/gui/default_world.png new file mode 100644 index 000000000..6efe431ee Binary files /dev/null and b/game/assets/gui/default_world.png differ diff --git a/game/assets/gui/feedback.png b/game/assets/gui/feedback.png new file mode 100644 index 000000000..9a2c7a951 Binary files /dev/null and b/game/assets/gui/feedback.png differ diff --git a/game/assets/gui/feedback_fill.png b/game/assets/gui/feedback_fill.png new file mode 100644 index 000000000..18a46f0a3 Binary files /dev/null and b/game/assets/gui/feedback_fill.png differ diff --git a/game/assets/gui/feedback_outer.png b/game/assets/gui/feedback_outer.png new file mode 100644 index 000000000..b75923fb6 Binary files /dev/null and b/game/assets/gui/feedback_outer.png differ diff --git a/game/assets/gui/gui.png b/game/assets/gui/gui.png new file mode 100644 index 000000000..38a3a3a91 Binary files /dev/null and b/game/assets/gui/gui.png differ diff --git a/game/assets/gui/gui_custom.png b/game/assets/gui/gui_custom.png old mode 100755 new mode 100644 diff --git a/game/assets/gui/gui_touch.png b/game/assets/gui/gui_touch.png new file mode 100644 index 000000000..33708a8a3 Binary files /dev/null and b/game/assets/gui/gui_touch.png differ diff --git a/game/assets/gui/icons.png b/game/assets/gui/icons.png new file mode 100644 index 000000000..d349fe9e1 Binary files /dev/null and b/game/assets/gui/icons.png differ diff --git a/game/assets/gui/items.png b/game/assets/gui/items.png new file mode 100644 index 000000000..eb9536c28 Binary files /dev/null and b/game/assets/gui/items.png differ diff --git a/game/assets/icon.ico b/game/assets/icon.ico old mode 100755 new mode 100644 diff --git a/game/assets/icon.png b/game/assets/icon.png old mode 100755 new mode 100644 diff --git a/game/assets/item/camera.png b/game/assets/item/camera.png new file mode 100644 index 000000000..f939cbc6e Binary files /dev/null and b/game/assets/item/camera.png differ diff --git a/game/assets/misc/pumpkinblur.png b/game/assets/misc/pumpkinblur.png new file mode 100644 index 000000000..f8200c620 Binary files /dev/null and b/game/assets/misc/pumpkinblur.png differ diff --git a/game/assets/mob/char.png b/game/assets/mob/char.png new file mode 100644 index 000000000..83e94ad03 Binary files /dev/null and b/game/assets/mob/char.png differ diff --git a/game/assets/mob/chicken.png b/game/assets/mob/chicken.png new file mode 100644 index 000000000..7726e084c Binary files /dev/null and b/game/assets/mob/chicken.png differ diff --git a/game/assets/mob/cow.png b/game/assets/mob/cow.png new file mode 100755 index 000000000..fdc8a794d Binary files /dev/null and b/game/assets/mob/cow.png differ diff --git a/game/assets/mob/creeper.png b/game/assets/mob/creeper.png new file mode 100644 index 000000000..37c36ca81 Binary files /dev/null and b/game/assets/mob/creeper.png differ diff --git a/game/assets/mob/pig.png b/game/assets/mob/pig.png new file mode 100644 index 000000000..2bc042fcc Binary files /dev/null and b/game/assets/mob/pig.png differ diff --git a/game/assets/mob/sheep.png b/game/assets/mob/sheep.png new file mode 100644 index 000000000..07363a33a Binary files /dev/null and b/game/assets/mob/sheep.png differ diff --git a/game/assets/mob/sheep_fur.png b/game/assets/mob/sheep_fur.png new file mode 100644 index 000000000..1f6a822d8 Binary files /dev/null and b/game/assets/mob/sheep_fur.png differ diff --git a/game/assets/mob/skeleton.png b/game/assets/mob/skeleton.png new file mode 100644 index 000000000..67f9d0c04 Binary files /dev/null and b/game/assets/mob/skeleton.png differ diff --git a/game/assets/mob/spider.png b/game/assets/mob/spider.png new file mode 100644 index 000000000..6b934fc98 Binary files /dev/null and b/game/assets/mob/spider.png differ diff --git a/game/assets/mob/zombie.png b/game/assets/mob/zombie.png new file mode 100644 index 000000000..81ef73c21 Binary files /dev/null and b/game/assets/mob/zombie.png differ diff --git a/game/assets/particles.png b/game/assets/particles.png new file mode 100644 index 000000000..49a24a821 Binary files /dev/null and b/game/assets/particles.png differ diff --git a/game/assets/patches/n_rocket.png b/game/assets/patches/n_rocket.png old mode 100755 new mode 100644 diff --git a/game/assets/patches/n_rocket_launched.png b/game/assets/patches/n_rocket_launched.png old mode 100755 new mode 100644 diff --git a/game/assets/patches/n_rocket_launcher.png b/game/assets/patches/n_rocket_launcher.png old mode 100755 new mode 100644 diff --git a/game/assets/patches/p_camera.png b/game/assets/patches/p_camera.png new file mode 100644 index 000000000..a50f95cf9 Binary files /dev/null and b/game/assets/patches/p_camera.png differ diff --git a/game/assets/patches/p_crying_obsidian.png b/game/assets/patches/p_crying_obsidian.png new file mode 100755 index 000000000..c0ee968f3 Binary files /dev/null and b/game/assets/patches/p_crying_obsidian.png differ diff --git a/game/assets/patches/p_rose.png b/game/assets/patches/p_rose.png new file mode 100644 index 000000000..d59352ea3 Binary files /dev/null and b/game/assets/patches/p_rose.png differ diff --git a/game/assets/patches/patch_data.txt b/game/assets/patches/patch_data.txt old mode 100755 new mode 100644 diff --git a/game/assets/readme.txt b/game/assets/readme.txt old mode 100755 new mode 100644 index ba85b679b..00b6f2f9d --- a/game/assets/readme.txt +++ b/game/assets/readme.txt @@ -1 +1,11 @@ -Paste your MCPE v0.1.0 assets here. Make sure to merge the directories, and overwrite any files, if necessary. \ No newline at end of file +Texture credits: +GGO4: parts of items.png, parts of terrain.png, cow.png +glitchy8015: default_world.png +Goodly: parts of terrain.png, all mobs except the cow, All of gui.png except touch buttons, clouds.png, font/default.png, p_rose.png, parts of p_crying_obsidian.png +iProgramMC: parts of terrain.png, parts of p_crying_obsidian.png +Un1q32: parts of terrain.png, particles.png, icons.png, parts of items.png, p_camera.png +Wilylcaro: gui.png touch buttons +XSSheep: parts of terrain.png, almost all of items.png, pumpkinblur.png, sun.png, moon.png + +GGO4's textures are licensed under https://mit-license.org/ +XSSheep's textures are licensed under https://creativecommons.org/licenses/by-sa/4.0/ diff --git a/game/assets/resource_packs/mojang/.gitignore b/game/assets/resource_packs/mojang/.gitignore new file mode 100644 index 000000000..34dbb3fe2 --- /dev/null +++ b/game/assets/resource_packs/mojang/.gitignore @@ -0,0 +1,3 @@ +* +!/.gitignore +!/pack.txt diff --git a/game/assets/resource_packs/mojang/pack.txt b/game/assets/resource_packs/mojang/pack.txt new file mode 100644 index 000000000..5d4ddc9b3 --- /dev/null +++ b/game/assets/resource_packs/mojang/pack.txt @@ -0,0 +1 @@ +The original Minecraft textures diff --git a/game/assets/terrain.png b/game/assets/terrain.png new file mode 100644 index 000000000..660a609e8 Binary files /dev/null and b/game/assets/terrain.png differ diff --git a/game/assets/terrain/moon.png b/game/assets/terrain/moon.png new file mode 100644 index 000000000..408a79edd Binary files /dev/null and b/game/assets/terrain/moon.png differ diff --git a/game/assets/terrain/sun.png b/game/assets/terrain/sun.png new file mode 100644 index 000000000..6a134bbec Binary files /dev/null and b/game/assets/terrain/sun.png differ diff --git a/source/client/app/NinecraftApp.cpp b/source/client/app/NinecraftApp.cpp index fbddf3254..11d8f077b 100644 --- a/source/client/app/NinecraftApp.cpp +++ b/source/client/app/NinecraftApp.cpp @@ -191,13 +191,7 @@ void NinecraftApp::_initAll() #endif m_pGui = new Gui(this); - // "Default.png" for the launch image overwrites "default.png" for the font during app packaging - std::string font = "font/default8.png"; - { - if (!Resource::hasResource(font)) - font = "font/default.png"; - } - m_pFont = new Font(getOptions(), font, m_pTextures); + m_pFont = new Font(getOptions(), "font/default.png", m_pTextures); m_pLevelRenderer = new LevelRenderer(this, m_pTextures); m_pGameRenderer = new GameRenderer(this); m_pParticleEngine = new ParticleEngine(m_pLevel, m_pTextures); diff --git a/source/client/gui/screens/StartMenuScreen.cpp b/source/client/gui/screens/StartMenuScreen.cpp index e9a603b63..a5227aa37 100644 --- a/source/client/gui/screens/StartMenuScreen.cpp +++ b/source/client/gui/screens/StartMenuScreen.cpp @@ -212,7 +212,7 @@ const char* gSplashes[] = "20 GOTO 10!", "Verlet intregration!", // [sic] "Peter Griffin!", - "Do not distribute!", + "Redistributable!", // Do not distribute! "Cogito ergo sum!", "4815162342 lines of code!", "A skeleton popped out!", diff --git a/source/client/player/input/TouchscreenInput_TestFps.cpp b/source/client/player/input/TouchscreenInput_TestFps.cpp index 2dde7d3eb..f056484f0 100644 --- a/source/client/player/input/TouchscreenInput_TestFps.cpp +++ b/source/client/player/input/TouchscreenInput_TestFps.cpp @@ -313,7 +313,11 @@ static void RenderTouchButton(Tesselator* t, PolygonArea* pArea, int srcX, int s void TouchscreenInput_TestFps::render(float f) { - m_pMinecraft->m_pTextures->loadAndBindTexture("gui/gui.png"); + std::string gui = "gui/gui_touch.png"; + if (!m_pMinecraft->m_pResourceLoader->hasTexture(gui)) + gui = "gui/gui.png"; + + m_pMinecraft->m_pTextures->loadAndBindTexture(gui); currentShaderColor = Color::WHITE; currentShaderDarkColor = Color::WHITE; diff --git a/tools/extract_apk.py b/tools/extract_apk.py index 21f8c8764..a5c94a8d2 100755 --- a/tools/extract_apk.py +++ b/tools/extract_apk.py @@ -5,6 +5,7 @@ import sys import zipfile import os +import shutil # Constants TITLE = 'APK Extractor' @@ -39,7 +40,7 @@ def extract_sounds(apk_zip): # Extract Assets def extract_assets(apk_zip): assets = os.path.dirname(os.path.abspath(__file__)) - assets = os.path.join(assets, '..', 'game', 'assets') + assets = os.path.join(assets, '..', 'game', 'assets', 'resource_packs', 'mojang') # Search For Assets for name in apk_zip.namelist(): if name.startswith(ASSETS_DIR): @@ -52,6 +53,11 @@ def extract_assets(apk_zip): with open(out, 'wb') as file: file.write(apk_zip.read(name)) + gui = os.path.join(assets, 'gui') + gui_touch = os.path.join(gui, 'gui_touch.png') + gui = os.path.join(gui, 'gui.png') + shutil.copy(gui, gui_touch) + # Open APK def open_apk(): if use_gui: