diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cb2c65d0d..1c5cbc25e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -260,8 +260,8 @@ jobs:
name: VS 2022 ${{ matrix.config.arch }}-${{ matrix.type }}
runs-on: windows-2022
env:
- VCPKG_VERSION: af2287382b1991dbdcb7e5112d236f3323b9dd7a
-# 2022.03.10
+ VCPKG_VERSION: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
+# 2023.11.20
vcpkg_packages: irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit gmp jsoncpp
strategy:
fail-fast: false
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index feec7cc65..c357de0e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,46 +1,81 @@
---
# Github repository is really at minetest.org using the poikilos git.minetest.io
-# https://gitlab.com/minenux/minetest-engine-multicraft2
-# Pipelines URL: https://gitlab.com/minenux/minetest-engine-multicraft2/pipelines
+# https://gitlab.com/minenux/minetest-engine-minetest
+# Pipelines URL: https://gitlab.com/minenux/minetest-engine-minetest/pipelines
# packages moved to https://build.opensuse.org/project/show/home:venenux:minenux
# in future we only build here, or made apk packs for alpine
stages:
- build
- - package
- - deploy
-variables:
- MINETEST_GAME_REPO: "https://gitlab.com/minenux/minetest-game-minetest.git"
- CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
-
-.build_template:
+.build_template: &build_definition
stage: build
script:
- mkdir cmakebuild
- mkdir -p artifact/multicraft/usr/
- mkdir -p games
- cd games
- - git clone -b stable-0.4 --single-branch $MINETEST_GAME_REPO minetest
+ - git clone -b stable-5.2 --single-branch https://codeberg.org/minenux/minetest-game-minetest minetest
- cd ../cmakebuild
- - cmake -DCMAKE_INSTALL_PREFIX=../artifact/multicraft/usr/ -DBUILD_SERVER=ON -DBUILD_CLIENT=ON -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=TRUE -DENABLE_GETTEXT=TRUE -DENABLE_SYSTEM_JSONCPP=TRUE -DAPPLY_LOCALE_BLACKLIST=TRUE -DCMAKE_VERBOSE_MAKEFILE=ON ..
+ - cmake -DCMAKE_INSTALL_PREFIX=../artifact/multicraft/usr/ -DBUILD_SERVER=ON -DBUILD_CLIENT=ON -DRUN_IN_PLACE=OFF -DENABLE_CURL=ON -DENABLE_SOUND=ON -DENABLE_LUAJIT=ON -DENABLE_GETTEXT=ON -DENABLE_FREETYPE=ON -DENABLE_SYSTEM_GMP=ON -DENABLE_SYSTEM_JSONCPP=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_POSTGRESQL=ON ..
- make -j$(nproc)
- make install
artifacts:
when: on_success
- expire_in: 5h
+ expire_in: 1y
paths:
- artifact/*
+##
+## Alpine the limited distro for nonsocial geeks
+##
+
+build:alpine-312:
+ extends: .build_template
+ image: alpine:3.12
+ before_script:
+ - apk update
+ - apk add build-base cmake pkgconf gettext-dev bzip2-dev curl-dev libnl3-dev rtmpdump-dev libidn2-dev ncurses-dev freetype-dev mesa-dev gmp-dev irrlicht-dev libjpeg-turbo-dev jsoncpp-dev leveldb-dev luajit-dev lua5.1-dev libogg-dev openal-soft-dev libpng-dev postgresql-dev hiredis-dev sqlite-dev libvorbis-dev libxi-dev zlib-dev doxygen libxrandr-dev libx11-dev zstd-dev openssl-dev samurai
+
+build:alpine-314:
+ extends: .build_template
+ image: alpine:3.14
+ before_script:
+ - apk update
+ - apk add build-base cmake pkgconf gettext-dev bzip2-dev curl-dev libnl3-dev rtmpdump-dev libidn2-dev ncurses-dev freetype-dev mesa-dev gmp-dev irrlicht-dev libjpeg-turbo-dev jsoncpp-dev leveldb-dev luajit-dev lua5.1-dev libogg-dev openal-soft-dev libpng-dev postgresql-dev hiredis-dev sqlite-dev libvorbis-dev libxi-dev zlib-dev doxygen libxrandr-dev libx11-dev zstd-dev openssl-dev samurai
+
+build:alpine-316:
+ extends: .build_template
+ image: alpine:3.16
+ before_script:
+ - apk update
+ - apk add build-base cmake pkgconf gettext-dev bzip2-dev curl-dev libnl3-dev rtmpdump-dev libidn2-dev ncurses-dev freetype-dev mesa-dev gmp-dev irrlicht-dev libjpeg-turbo-dev jsoncpp-dev leveldb-dev luajit-dev lua5.1-dev libogg-dev openal-soft-dev libpng-dev postgresql-dev hiredis-dev sqlite-dev libvorbis-dev libxi-dev zlib-dev doxygen libxrandr-dev libx11-dev zstd-dev openssl-dev samurai
+
+build:alpine-319:
+ extends: .build_template
+ image: alpine:3.19
+ before_script:
+ - apk update
+ - apk add build-base cmake pkgconf gettext-dev bzip2-dev curl-dev libnl3-dev rtmpdump-dev libidn2-dev ncurses-dev freetype-dev mesa-dev gmp-dev irrlicht-dev libjpeg-turbo-dev jsoncpp-dev leveldb-dev luajit-dev lua5.1-dev libogg-dev openal-soft-dev libpng-dev postgresql-dev hiredis-dev sqlite-dev libvorbis-dev libxi-dev zlib-dev doxygen libxrandr-dev libx11-dev zstd-dev openssl-dev samurai
+
+# error - need to enable testing repo due spatial index
+#build:alpine-edge:
+# extends: .build_template
+# image: alpine:edge
+# before_script:
+# - apk update
+# - apk add build-base git cmake pkgconf gettext-dev bzip2-dev curl-dev libnl3-dev rtmpdump-dev libidn2-dev ncurses-dev freetype-dev mesa-dev gmp-dev irrlicht-dev libjpeg-turbo-dev jsoncpp-dev leveldb-dev luajit-dev lua5.1-dev libogg-dev openal-soft-dev libpng-dev postgresql-dev hiredis-dev sqlite-dev libvorbis-dev libxi-dev zlib-dev doxygen libxrandr-dev libx11-dev zstd-dev openssl1.1-compat-dev samurai libspatialindex-dev
+
+
##
## Debian mother of many distros
##
# Jessie
-build:debian-8:
- extends: .build_template
- image: debian:8
+build:debian-8-64:
+ <<: *build_definition
+ image: amd64/debian:8
before_script:
- echo "" > /etc/apt/apt.conf.d/50venenuxcustom
- echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
@@ -50,19 +85,17 @@ build:debian-8:
- echo "Acquire::Check-Valid-Until \"false\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-# - echo "Acquire::https::download.opensuse.org::Verify-Peer "false";" >> /etc/apt/apt.conf.d/50venenuxcustom
- rm -rf /etc/apt/sources.list
- echo "deb http://archive.debian.org/debian/ jessie main contrib" > /etc/apt/sources.list.d/50debianoficial.list
- echo "deb http://archive.debian.org/debian/ jessie-backports main contrib non-free" >> /etc/apt/sources.list.d/50debianoficial.list
- echo "deb http://deb.freexian.com/extended-lts jessie main contrib non-free" >> /etc/apt/sources.list.d/50debianoficial.list
- DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install build-essential git cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev x11proto-xf86vidmode-dev
- - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install -t jessie-backports libjsoncpp-dev
-# Stretch
+ - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install build-essential cmake pkg-config cmake-data debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev libpq-dev postgresql-server-dev-all libhiredis-dev zlib1g-dev doxygen libxrandr-dev x11proto-xf86vidmode-dev
+ - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes -t jessie-backports install libjsoncpp-dev
-build:debian-9:
- extends: .build_template
- image: debian:9
+build:debian-8-32:
+ <<: *build_definition
+ image: i386/debian:8
before_script:
- echo "" > /etc/apt/apt.conf.d/50venenuxcustom
- echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
@@ -73,260 +106,109 @@ build:debian-9:
- echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- rm -rf /etc/apt/sources.list
- - echo "deb http://archive.debian.org/debian/ stretch main contrib" > /etc/apt/sources.list.d/50debianoficial.list
- - echo "deb http://archive.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list.d/50debianoficial.list
- - echo "deb http://deb.freexian.com/extended-lts stretch main contrib non-free" >> /etc/apt/sources.list.d/50debianoficial.list
+ - echo "deb http://archive.debian.org/debian/ jessie main contrib" > /etc/apt/sources.list.d/50debianoficial.list
+ - echo "deb http://archive.debian.org/debian/ jessie-backports main contrib non-free" >> /etc/apt/sources.list.d/50debianoficial.list
+ - echo "deb http://deb.freexian.com/extended-lts jessie main contrib non-free" >> /etc/apt/sources.list.d/50debianoficial.list
- DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install build-essential git cmake pkg-config cmake-data debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
+ - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install build-essential cmake pkg-config cmake-data debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev libpq-dev postgresql-server-dev-all libhiredis-dev zlib1g-dev doxygen libxrandr-dev x11proto-xf86vidmode-dev
+ - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes -t jessie-backports install libjsoncpp-dev
-# Bullseye
+# Stretch
-build:debian-11:
- extends: .build_template
- image: debian:11
+build:debian-9-32:
+ <<: *build_definition
+ image: i386/debian:9
before_script:
- echo "" > /etc/apt/apt.conf.d/50venenuxcustom
- echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowDowngradeToInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowReleaseInfoChange::Suite \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Check-Valid-Until \"false\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
+ - echo "deb http://archive.debian.org/debian/ stretch main contrib" > /etc/apt/sources.list.d/50debianoficial.list
+ - echo "deb http://deb.freexian.com/extended-lts stretch main contrib non-free" > /etc/apt/sources.list
- DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake pkg-config cmake-data debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
+ - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
-# bookworm
+# Bullseye
+
+build:debian-11:
+ <<: *build_definition
+ image: debian:11
+ before_script:
+ - apt-get update -y || true
+ - apt-get -y install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev postgresql-server-dev-all libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
+
+# Bookworm
build:debian-12:
- extends: .build_template
+ <<: *build_definition
image: debian:12
before_script:
- - DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake pkg-config cmake-data debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
-
+ - apt-get update -y || true
+ - apt-get -y install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
##
-## Ubuntu
+## winbuntu the distro for stupid users
##
-# Utopic most close to jessie
+build:ubuntu-22.04:
+ <<: *build_definition
+ image: ubuntu:jammy
+ before_script:
+ - DEBIAN_FRONTEND=noninteractive apt-get update -y
+ - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
-#build:ubuntu-14.10:
-# extends: .build_template
-# image: ubuntu:utopic
-# before_script:
-# - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
-# - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-# - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-# - echo "Acquire::AllowDowngradeToInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-# - echo "Acquire::AllowReleaseInfoChange::Suite \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-# - echo "Acquire::Check-Valid-Until \"false\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-# - echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-# - echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-# - rm -rf /etc/apt/sources.list
-# - echo "deb http://old-releases.ubuntu.com/ubuntu/ utopic main restricted universe multiverse" > /etc/apt/sources.list.d/50debianoficial.list
-# - echo "deb http://old-releases.ubuntu.com/ubuntu/ utopic-updates main restricted universe multiverse" >> /etc/apt/sources.list.d/50debianoficial.list
-# - echo "deb http://old-releases.ubuntu.com/ubuntu utopic-security main restricted universe multiverse" >> /etc/apt/sources.list.d/50debianoficial.list
-# - apt-get update -y || true
-# - apt-get -y --force-yes install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev
+# Focal most close to bullseye
+
+build:ubuntu-20.04:
+ <<: *build_definition
+ image: ubuntu:focal
+ before_script:
+ - DEBIAN_FRONTEND=noninteractive apt-get update -y
+ - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
+
+# yakkety most close to jessie
+
+build:ubuntu-16.10:
+ <<: *build_definition
+ image: ubuntu:yakkety
+ before_script:
+ - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
+ - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
+ - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
+ - rm -rf /etc/apt/sources.list
+ - echo "deb http://old-releases.ubuntu.com/ubuntu/ yakkety main restricted universe multiverse" > /etc/apt/sources.list.d/50debianoficial.list
+ - echo "deb http://old-releases.ubuntu.com/ubuntu/ yakkety-updates main restricted universe multiverse" >> /etc/apt/sources.list.d/50debianoficial.list
+ - echo "deb http://old-releases.ubuntu.com/ubuntu yakkety-security main restricted universe multiverse" >> /etc/apt/sources.list.d/50debianoficial.list
+ - apt-get update -y || true
+ - apt-get -y --force-yes install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev
# Zesty most close to stretch
build:ubuntu-17.04:
- extends: .build_template
+ <<: *build_definition
image: ubuntu:zesty
before_script:
- echo "" > /etc/apt/apt.conf.d/50venenuxcustom
- echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowDowngradeToInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowReleaseInfoChange::Suite \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Check-Valid-Until \"false\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- rm -rf /etc/apt/sources.list
- echo "deb http://old-releases.ubuntu.com/ubuntu/ zesty main restricted universe multiverse" > /etc/apt/sources.list.d/50debianoficial.list
- echo "deb http://old-releases.ubuntu.com/ubuntu/ zesty-updates main restricted universe multiverse" >> /etc/apt/sources.list.d/50debianoficial.list
- echo "deb http://old-releases.ubuntu.com/ubuntu zesty-security main restricted universe multiverse" >> /etc/apt/sources.list.d/50debianoficial.list
- - DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install build-essential git cmake pkg-config cmake-data debhelper dh-systemd dh-autoreconf lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
-
-# artful most close to stretch
-
-build:ubuntu-17.10:
- extends: .build_template
- image: ubuntu:artful
- before_script:
- - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
- - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowDowngradeToInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowReleaseInfoChange::Suite \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Check-Valid-Until \"false\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - rm -rf /etc/apt/sources.list
- - echo "deb http://old-releases.ubuntu.com/ubuntu/ artful main restricted universe multiverse" > /etc/apt/sources.list.d/50debianoficial.list
- - echo "deb http://old-releases.ubuntu.com/ubuntu/ artful-updates main restricted universe multiverse" >> /etc/apt/sources.list.d/50debianoficial.list
- - echo "deb http://old-releases.ubuntu.com/ubuntu artful-security main restricted universe multiverse" >> /etc/apt/sources.list.d/50debianoficial.list
- - DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes install build-essential git cmake pkg-config cmake-data debhelper dh-systemd dh-autoreconf lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
-
-# Xenial
-
-build:ubuntu-16.04:
- extends: .build_template
- image: ubuntu:xenial
- before_script:
- - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
- - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowDowngradeToInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowReleaseInfoChange::Suite \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Check-Valid-Until \"false\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake pkg-config libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
-
-# Bionic
-
-build:ubuntu-18.04:
- extends: .build_template
- image: ubuntu:bionic
- before_script:
- - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
- - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowDowngradeToInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowReleaseInfoChange::Suite \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Check-Valid-Until \"false\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake pkg-config libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
-
-# Focal
-
-build:ubuntu-20.04:
- extends: .build_template
- image: ubuntu:focal
- before_script:
- - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
- - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowDowngradeToInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::AllowReleaseInfoChange::Suite \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Check-Valid-Until \"false\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Acquire::Languages \"en\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
- - DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake pkg-config libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
-
-# jammy
-
-build:ubuntu-22.04:
- extends: .build_template
- image: ubuntu:jammy
- before_script:
- - DEBIAN_FRONTEND=noninteractive apt-get update -y || true
- - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake pkg-config libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+ - apt-get update -y || true
+ - apt-get -y --force-yes install build-essential cmake pkg-config debhelper dh-systemd dh-autoreconf lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
##
-## Fedora
+## Feladora shit distro
##
-# Fedora 28 <-> RHEL 8
-build:fedora-28:
- extends: .build_template
- image: fedora:28
- before_script:
- - dnf -y install make automake gcc gcc-c++ kernel-devel git cmake pkgconfig libidn-devel libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel
-
-# Fedora 36
build:fedora-36:
- extends: .build_template
+ <<: *build_definition
image: fedora:36
before_script:
- - dnf -y install make automake gcc gcc-c++ kernel-devel git cmake pkgconfig libidn-devel bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel irrlicht-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl-devel libcurl luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel libpq-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen
+ - dnf -y install make automake gcc gcc-c++ kernel-devel cmake pkgconfig bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel irrlicht-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl-devel libcurl luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen
-# Fedora 37
build:fedora-37:
- extends: .build_template
+ <<: *build_definition
image: fedora:37
before_script:
- - dnf -y install make automake gcc gcc-c++ kernel-devel git cmake pkgconfig libidn-devel bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel irrlicht-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl-devel libcurl luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel libpq-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen
-
-# Fedora 38
-build:fedora-38:
- extends: .build_template
- image: fedora:38
- before_script:
- - dnf -y install make automake gcc gcc-c++ kernel-devel git cmake pkgconfig libidn-devel bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel irrlicht-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl-devel libcurl luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel libpq-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen
-
-##
-## MinGW for Windows
-##
-
-.generic_win_template:
- image: ubuntu:bionic
- before_script:
- - apt-get update -y
- - apt-get install -y wget xz-utils unzip git cmake gettext
- - wget -nv http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
- - tar -xaf mingw.tar.xz -C /usr
-
-.build_win_template:
- extends: .generic_win_template
- stage: build
- artifacts:
- expire_in: 1h
- paths:
- - build/multicraft/_build/*
-
-.package_win_template:
- extends: .generic_win_template
- stage: package
- script:
- - unzip build/multicraft/_build/multicraft-*.zip
- - wget -nv https://gitlab.com/minenux/minetest-game-minetest/-/archive/stable-5.2/minetest-game-minetest-stable-5.2.tar.gz -O game.tar.gz
- - tar -xvf game.tar.gz -C /
- - mv /minetest*game* multicraft-*-win*/games/minetest || true
- - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libgcc*.dll multicraft-*-win*/bin/
- - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libstdc++*.dll multicraft-*-win*/bin/
- - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libwinpthread*.dll multicraft-*-win*/bin/
- artifacts:
- expire_in: 90 day
- paths:
- - multicraft-*-win*/*
-
-build:win32:
- extends: .build_win_template
- script:
- - ./util/buildbot/buildwin32.sh build
- variables:
- WIN_ARCH: "i686"
-
-package:win32:
- extends: .package_win_template
- needs:
- - build:win32
- variables:
- WIN_ARCH: "i686"
-
-
-build:win64:
- extends: .build_win_template
- script:
- - ./util/buildbot/buildwin64.sh build
- variables:
- WIN_ARCH: "x86_64"
-
-package:win64:
- extends: .package_win_template
- needs:
- - build:win64
- variables:
- WIN_ARCH: "x86_64"
-
+ - dnf -y install make automake gcc gcc-c++ kernel-devel cmake pkgconfig bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel irrlicht-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl-devel libcurl luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index c4da0a6d0..a977d0ee9 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
android {
- compileSdkVersion 33
- buildToolsVersion '33.0.2'
+ compileSdkVersion 34
+ buildToolsVersion '34.0.0'
ndkVersion '25.2.9519653'
defaultConfig {
applicationId 'com.multicraft.game'
minSdkVersion 21
- targetSdkVersion 33
+ targetSdkVersion 34
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
versionCode project.versionCode
}
@@ -100,7 +100,7 @@ tasks.register('prepareAssetsFiles') {
tasks.register('zipAssetsFiles', Zip) {
dependsOn prepareAssetsFiles
archiveFileName = 'assets.zip'
- destinationDirectory = file('src/main/assets/data')
+ destinationDirectory = file('src/main/assets')
from('build/assets/Files')
}
@@ -125,7 +125,8 @@ dependencies {
/* Third-party libraries */
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat-resources:1.6.1'
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+ implementation("androidx.browser:browser:1.6.0")
+ implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.work:work-runtime-ktx:2.8.1'
- implementation 'com.google.android.material:material:1.9.0'
+ implementation 'com.google.android.material:material:1.10.0'
}
diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
index 7e743f503..028143246 100644
--- a/Android/app/src/main/AndroidManifest.xml
+++ b/Android/app/src/main/AndroidManifest.xml
@@ -28,7 +28,6 @@
+
+
+
diff --git a/Android/app/src/main/java/com/multicraft/game/CustomEditText.kt b/Android/app/src/main/java/com/multicraft/game/CustomEditText.kt
index c924a63c8..baf240b64 100644
--- a/Android/app/src/main/java/com/multicraft/game/CustomEditText.kt
+++ b/Android/app/src/main/java/com/multicraft/game/CustomEditText.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/Android/app/src/main/java/com/multicraft/game/GameActivity.kt b/Android/app/src/main/java/com/multicraft/game/GameActivity.kt
index 27c98241d..1118fcce3 100644
--- a/Android/app/src/main/java/com/multicraft/game/GameActivity.kt
+++ b/Android/app/src/main/java/com/multicraft/game/GameActivity.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -20,11 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
package com.multicraft.game
-import android.content.Intent
import android.content.res.Configuration
-import android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO
import android.net.Uri
-import android.os.Bundle
+import android.os.*
import android.text.InputType
import android.view.*
import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN
@@ -33,12 +31,15 @@ import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsIntent.SHARE_STATE_OFF
import com.multicraft.game.MainActivity.Companion.radius
-import com.multicraft.game.databinding.InputTextBinding
-import com.multicraft.game.databinding.MultilineInputBinding
+import com.multicraft.game.databinding.*
import com.multicraft.game.helpers.*
import com.multicraft.game.helpers.ApiLevelHelper.isOreo
import org.libsdl.app.SDLActivity
+import java.util.*
+import kotlin.system.exitProcess
class GameActivity : SDLActivity() {
companion object {
@@ -52,24 +53,23 @@ class GameActivity : SDLActivity() {
external fun keyboardEvent(keyboard: Boolean)
}
- private var messageReturnCode = -1
private var messageReturnValue = ""
private var hasKeyboard = false
+ override fun getLibraries() = arrayOf("MultiCraft")
- override fun getLibraries(): Array {
- return arrayOf(
- "MultiCraft"
- )
- }
-
- override fun getMainSharedObject(): String {
- return getContext().applicationInfo.nativeLibraryDir + "/libMultiCraft.so"
- }
+ override fun getMainSharedObject() =
+ "${getContext().applicationInfo.nativeLibraryDir}/libMultiCraft.so"
override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
+ try {
+ super.onCreate(savedInstanceState)
+ } catch (e: Error) {
+ exitProcess(0)
+ } catch (e: Exception) {
+ exitProcess(0)
+ }
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
- hasKeyboard = resources.configuration.hardKeyboardHidden == HARDKEYBOARDHIDDEN_NO
+ hasKeyboard = hasHardKeyboard()
}
override fun onWindowFocusChanged(hasFocus: Boolean) {
@@ -89,15 +89,13 @@ class GameActivity : SDLActivity() {
override fun onResume() {
super.onResume()
- if (hasKeyboard)
- keyboardEvent(hasKeyboard)
+ if (hasKeyboard) keyboardEvent(true)
window.makeFullScreen()
}
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
- val statusKeyboard =
- resources.configuration.hardKeyboardHidden == HARDKEYBOARDHIDDEN_NO
+ val statusKeyboard = hasHardKeyboard()
if (hasKeyboard != statusKeyboard) {
hasKeyboard = statusKeyboard
keyboardEvent(hasKeyboard)
@@ -106,8 +104,8 @@ class GameActivity : SDLActivity() {
@Suppress("unused")
fun showDialog(hint: String?, current: String?, editType: Int) {
+ isInputActive = true
messageReturnValue = ""
- messageReturnCode = -1
if (editType == 1)
runOnUiThread { showMultiLineDialog(hint, current) }
else
@@ -115,7 +113,6 @@ class GameActivity : SDLActivity() {
}
private fun showSingleDialog(hint: String?, current: String?, editType: Int) {
- isInputActive = true
val builder = AlertDialog.Builder(this, R.style.FullScreenDialogStyle)
val binding = InputTextBinding.inflate(layoutInflater)
var hintText: String = hint?.ifEmpty {
@@ -139,40 +136,37 @@ class GameActivity : SDLActivity() {
editText.inputType = inputType
editText.setSelection(editText.text?.length ?: 0)
// for Android OS
- editText.setOnEditorActionListener { _: TextView?, KeyCode: Int, _: KeyEvent? ->
- if (KeyCode == KeyEvent.KEYCODE_ENTER || KeyCode == KeyEvent.KEYCODE_ENDCALL) {
+ editText.setOnEditorActionListener { _: TextView?, keyCode: Int, _: KeyEvent? ->
+ if (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_ENDCALL) {
imm.hideSoftInputFromWindow(editText.windowToken, 0)
messageReturnValue = editText.text.toString()
- messageReturnCode = 0
alertDialog.dismiss()
isInputActive = false
return@setOnEditorActionListener true
}
return@setOnEditorActionListener false
}
- // for Chrome OS
- editText.setOnKeyListener { _: View?, KeyCode: Int, _: KeyEvent? ->
- if (KeyCode == KeyEvent.KEYCODE_ENTER || KeyCode == KeyEvent.KEYCODE_ENDCALL) {
- imm.hideSoftInputFromWindow(editText.windowToken, 0)
- messageReturnValue = editText.text.toString()
- messageReturnCode = 0
- alertDialog.dismiss()
- isInputActive = false
- return@setOnKeyListener true
+ if (isChromebook()) {
+ editText.setOnKeyListener { _: View?, keyCode: Int, _: KeyEvent? ->
+ if (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_ENDCALL) {
+ imm.hideSoftInputFromWindow(editText.windowToken, 0)
+ messageReturnValue = editText.text.toString()
+ alertDialog.dismiss()
+ isInputActive = false
+ return@setOnKeyListener true
+ }
+ return@setOnKeyListener false
}
- return@setOnKeyListener false
}
binding.input.setEndIconOnClickListener {
imm.hideSoftInputFromWindow(editText.windowToken, 0)
messageReturnValue = editText.text.toString()
- messageReturnCode = 0
alertDialog.dismiss()
isInputActive = false
}
binding.rl.setOnClickListener {
window.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN)
messageReturnValue = current.toString()
- messageReturnCode = 0
alertDialog.dismiss()
isInputActive = false
}
@@ -180,18 +174,16 @@ class GameActivity : SDLActivity() {
// should be above `show()`
alertWindow.setSoftInputMode(SOFT_INPUT_STATE_VISIBLE)
alertDialog.show()
- if (!resources.getBoolean(R.bool.isTablet))
+ if (!isTablet())
alertWindow.makeFullScreenAlert()
alertDialog.setOnCancelListener {
window.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN)
messageReturnValue = current.toString()
- messageReturnCode = 0
isInputActive = false
}
}
private fun showMultiLineDialog(hint: String?, current: String?) {
- isInputActive = true
val builder = AlertDialog.Builder(this, R.style.FullScreenDialogStyle)
val binding = MultilineInputBinding.inflate(layoutInflater)
var hintText: String = hint?.ifEmpty {
@@ -208,40 +200,37 @@ class GameActivity : SDLActivity() {
editText.setSelection(editText.text?.length ?: 0)
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
// for Android OS
- editText.setOnEditorActionListener { _: TextView?, KeyCode: Int, _: KeyEvent? ->
- if (KeyCode == KeyEvent.KEYCODE_ENTER || KeyCode == KeyEvent.KEYCODE_ENDCALL) {
+ editText.setOnEditorActionListener { _: TextView?, keyCode: Int, _: KeyEvent? ->
+ if (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_ENDCALL) {
imm.hideSoftInputFromWindow(editText.windowToken, 0)
messageReturnValue = editText.text.toString()
- messageReturnCode = 0
alertDialog.dismiss()
isInputActive = false
return@setOnEditorActionListener true
}
return@setOnEditorActionListener false
}
- // for Chrome OS
- editText.setOnKeyListener { _: View?, KeyCode: Int, _: KeyEvent? ->
- if (KeyCode == KeyEvent.KEYCODE_ENTER || KeyCode == KeyEvent.KEYCODE_ENDCALL) {
- imm.hideSoftInputFromWindow(editText.windowToken, 0)
- messageReturnValue = editText.text.toString()
- messageReturnCode = 0
- alertDialog.dismiss()
- isInputActive = false
- return@setOnKeyListener true
+ if (isChromebook()) {
+ editText.setOnKeyListener { _: View?, keyCode: Int, _: KeyEvent? ->
+ if (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_ENDCALL) {
+ imm.hideSoftInputFromWindow(editText.windowToken, 0)
+ messageReturnValue = editText.text.toString()
+ alertDialog.dismiss()
+ isInputActive = false
+ return@setOnKeyListener true
+ }
+ return@setOnKeyListener false
}
- return@setOnKeyListener false
}
binding.multiInput.setEndIconOnClickListener {
imm.hideSoftInputFromWindow(editText.windowToken, 0)
messageReturnValue = editText.text.toString()
- messageReturnCode = 0
alertDialog.dismiss()
isInputActive = false
}
binding.multiRl.setOnClickListener {
window.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN)
messageReturnValue = current.toString()
- messageReturnCode = -1
alertDialog.dismiss()
isInputActive = false
}
@@ -249,23 +238,23 @@ class GameActivity : SDLActivity() {
val alertWindow = alertDialog.window!!
alertWindow.setSoftInputMode(SOFT_INPUT_STATE_VISIBLE)
alertDialog.show()
- if (!resources.getBoolean(R.bool.isTablet))
+ if (!isTablet())
alertWindow.makeFullScreenAlert()
alertDialog.setOnCancelListener {
window.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN)
messageReturnValue = current.toString()
- messageReturnCode = -1
isInputActive = false
}
}
@Suppress("unused")
- fun getDialogState() = messageReturnCode
+ fun isDialogActive() = isInputActive
@Suppress("unused")
fun getDialogValue(): String {
- messageReturnCode = -1
- return messageReturnValue
+ val value = messageReturnValue
+ messageReturnValue = ""
+ return value
}
@Suppress("unused")
@@ -282,9 +271,13 @@ class GameActivity : SDLActivity() {
@Suppress("unused")
fun openURI(uri: String?) {
+ val builder = CustomTabsIntent.Builder()
+ builder.setShareState(SHARE_STATE_OFF)
+ .setStartAnimations(this, R.anim.slide_in_bottom, R.anim.slide_out_top)
+ .setExitAnimations(this, R.anim.slide_in_top, R.anim.slide_out_bottom)
+ val customTabsIntent = builder.build()
try {
- val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(uri))
- startActivity(browserIntent)
+ customTabsIntent.launchUrl(this, Uri.parse(uri))
} catch (ignored: Exception) {
}
}
@@ -304,7 +297,7 @@ class GameActivity : SDLActivity() {
@Suppress("unused")
fun getSecretKey(key: String): String {
- return "Stub"
+ return key
}
@Suppress("unused")
diff --git a/Android/app/src/main/java/com/multicraft/game/MainActivity.kt b/Android/app/src/main/java/com/multicraft/game/MainActivity.kt
index 3845ddb14..419d54fa1 100644
--- a/Android/app/src/main/java/com/multicraft/game/MainActivity.kt
+++ b/Android/app/src/main/java/com/multicraft/game/MainActivity.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -22,18 +22,25 @@ package com.multicraft.game
import android.content.Intent
import android.content.SharedPreferences
-import android.graphics.Color
-import android.graphics.drawable.LayerDrawable
+import android.graphics.drawable.AnimationDrawable
import android.os.Bundle
-import android.view.*
+import android.provider.Settings.ACTION_WIFI_SETTINGS
+import android.provider.Settings.ACTION_WIRELESS_SETTINGS
+import android.view.RoundedCorner
+import android.view.WindowManager
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
-import androidx.lifecycle.*
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
import androidx.work.WorkInfo
import com.multicraft.game.databinding.ActivityMainBinding
+import com.multicraft.game.dialogs.ConnectionDialog
import com.multicraft.game.helpers.*
import com.multicraft.game.helpers.ApiLevelHelper.isAndroid12
+import com.multicraft.game.helpers.ApiLevelHelper.isPie
import com.multicraft.game.helpers.PreferenceHelper.TAG_BUILD_VER
import com.multicraft.game.helpers.PreferenceHelper.getStringValue
import com.multicraft.game.helpers.PreferenceHelper.set
@@ -49,11 +56,14 @@ class MainActivity : AppCompatActivity() {
private var externalStorage: File? = null
private val sep = File.separator
private lateinit var prefs: SharedPreferences
+ private lateinit var restartStartForResult: ActivityResultLauncher
+ private lateinit var connStartForResult: ActivityResultLauncher
private val versionCode = BuildConfig.VERSION_CODE
private val versionName = "${BuildConfig.VERSION_NAME}+$versionCode"
companion object {
var radius = 0
+ const val NO_SPACE_LEFT = "ENOSPC"
}
override fun onCreate(savedInstanceState: Bundle?) {
@@ -61,30 +71,34 @@ class MainActivity : AppCompatActivity() {
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
+ onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+ override fun handleOnBackPressed() {
+ }
+ })
+ connStartForResult = registerForActivityResult(
+ ActivityResultContracts.StartActivityForResult()
+ ) {
+ checkAppVersion()
+ }
+ restartStartForResult = registerForActivityResult(
+ ActivityResultContracts.StartActivityForResult()
+ ) {
+ if (it.resultCode == RESULT_OK)
+ finishApp(true)
+ else
+ finishApp(false)
+ }
try {
prefs = PreferenceHelper.init(this)
externalStorage = getExternalFilesDir(null)
- if (filesDir == null || cacheDir == null || externalStorage == null)
- throw IOException("Bad disk space state")
+ listOf(filesDir, cacheDir, externalStorage).requireNoNulls()
checkConnection()
- } catch (e: Exception) { // Storage -> IOException, Prefs -> GeneralSecurityException
- showRestartDialog(!e.message!!.contains("ENOPSC"))
+ } catch (e: Exception) {
+ val isRestart = e.message?.contains(NO_SPACE_LEFT) != true
+ showRestartDialog(restartStartForResult, isRestart)
}
}
- @Deprecated("Deprecated in Java")
- override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
- @Suppress("DEPRECATION")
- super.onActivityResult(requestCode, resultCode, data)
- if (requestCode == 104)
- checkAppVersion()
- }
-
- @Deprecated("Deprecated in Java")
- override fun onBackPressed() {
- // Prevent abrupt interruption when copy game files from assets
- }
-
override fun onResume() {
super.onResume()
window.makeFullScreen()
@@ -97,81 +111,66 @@ class MainActivity : AppCompatActivity() {
override fun onAttachedToWindow() {
super.onAttachedToWindow()
- if (isAndroid12()) {
- val insets = window.decorView.rootWindowInsets
- if (insets != null) {
- val tl = insets.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT)
- radius = tl?.radius ?: 0
+ if (isPie()) {
+ val cutout = window.decorView.rootWindowInsets.displayCutout
+ if (cutout != null) {
+ radius = 40
+ }
+ if (isAndroid12()) {
+ val insets = window.decorView.rootWindowInsets
+ if (insets != null) {
+ val tl = insets.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT)
+ radius = tl?.radius ?: if (cutout != null) 40 else 0
+ }
}
}
- }
-
-
- // interface
- private fun showProgress(textMessage: Int, progress: Int) {
- if (binding.progressBar.visibility == View.GONE) {
- binding.tvProgress.setText(textMessage)
- binding.progressCircle.visibility = View.GONE
- binding.progressBar.visibility = View.VISIBLE
- binding.progressBar.progress = 0
- } else if (progress > 0) {
- val progressMessage = "${getString(textMessage)} $progress%"
- binding.tvProgress.text = progressMessage
- binding.progressBar.progress = progress
- // colorize the progress bar
- val progressBarDrawable =
- (binding.progressBar.progressDrawable as LayerDrawable).getDrawable(0)
- val progressDrawable = (progressBarDrawable as LayerDrawable).getDrawable(1)
- val color = Color.rgb(255 - progress * 2, progress * 2, 25)
- progressDrawable.colorFilter =
- BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
- color, BlendModeCompat.SRC_IN
- )
- }
+ val animation = binding.loadingAnim.drawable as AnimationDrawable
+ animation.start()
}
private fun startNative() {
val initLua = File(filesDir, "builtin${sep}mainmenu${sep}init.lua")
if (initLua.exists() && initLua.canRead()) {
val intent = Intent(this, GameActivity::class.java)
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(intent)
} else {
prefs[TAG_BUILD_VER] = "0"
- showRestartDialog()
+ showRestartDialog(restartStartForResult)
}
}
private fun prepareToRun() {
- binding.tvProgress.setText(R.string.preparing)
- binding.progressCircle.visibility = View.VISIBLE
- binding.progressBar.visibility = View.GONE
- val filesList = listOf(
- File(externalStorage, "debug.txt"),
- File(filesDir, "builtin"),
- File(filesDir, "client"),
- File(filesDir, "fonts"),
- File(filesDir, "textures")
- )
- val zips = assets.list("data")!!.toList()
+ val filesList = mutableListOf().apply {
+ addAll(listOf(
+ "builtin",
+ "client${sep}shaders",
+ "fonts",
+ "games${sep}default",
+ "textures${sep}base"
+ ).map { File(filesDir, it) })
+ }
+
+ val zips = mutableListOf("assets.zip")
+
lifecycleScope.launch {
filesList.forEach { it.deleteRecursively() }
zips.forEach {
try {
- assets.open("data$sep$it").use { input ->
+ assets.open(it).use { input ->
File(cacheDir, it).copyInputStreamToFile(input)
}
} catch (e: IOException) {
- runOnUiThread { showRestartDialog(!e.message!!.contains("ENOSPC")) }
+ val isNotEnoughSpace = e.message!!.contains(NO_SPACE_LEFT)
+ runOnUiThread { showRestartDialog(restartStartForResult, !isNotEnoughSpace) }
return@forEach
}
}
try {
- startUnzipWorker(zips)
+ startUnzipWorker(zips.toTypedArray())
} catch (e: Exception) {
- runOnUiThread { showRestartDialog() }
+ runOnUiThread { showRestartDialog(restartStartForResult) }
}
}
}
@@ -184,31 +183,47 @@ class MainActivity : AppCompatActivity() {
prepareToRun()
}
+ private fun showConnectionDialog() {
+ val intent = Intent(this, ConnectionDialog::class.java)
+ val startForResult = registerForActivityResult(
+ ActivityResultContracts.StartActivityForResult()
+ ) {
+ when (it.resultCode) {
+ RESULT_OK -> connStartForResult.launch(Intent(ACTION_WIFI_SETTINGS))
+ RESULT_FIRST_USER -> connStartForResult.launch(Intent(ACTION_WIRELESS_SETTINGS))
+ else -> checkAppVersion()
+ }
+ }
+ startForResult.launch(intent)
+ }
+
// check connection available
private fun checkConnection() = lifecycleScope.launch {
- val result = isConnected()
- if (result) checkAppVersion()
+ if (isConnected()) checkAppVersion()
else try {
- showConnectionDialog { checkAppVersion() }
+ showConnectionDialog()
} catch (e: Exception) {
checkAppVersion()
}
}
- private fun startUnzipWorker(file: List) {
- val viewModelFactory = WorkerViewModelFactory(application, file.toTypedArray())
+ private fun startUnzipWorker(file: Array) {
+ val viewModelFactory = WorkerViewModelFactory(application, file)
val viewModel = ViewModelProvider(this, viewModelFactory)[WorkerViewModel::class.java]
viewModel.unzippingWorkObserver
.observe(this, Observer { workInfo ->
if (workInfo == null)
return@Observer
val progress = workInfo.progress.getInt(PROGRESS, 0)
- showProgress(R.string.loading, progress)
+ if (progress > 0) {
+ val progressMessage = "${getString(R.string.loading)} $progress%"
+ binding.tvProgress.text = progressMessage
+ }
if (workInfo.state.isFinished) {
if (workInfo.state == WorkInfo.State.FAILED) {
val isRestart = workInfo.outputData.getBoolean("restart", true)
- showRestartDialog(isRestart)
+ showRestartDialog(restartStartForResult, isRestart)
} else if (workInfo.state == WorkInfo.State.SUCCEEDED) {
prefs[TAG_BUILD_VER] = versionName
startNative()
diff --git a/Android/app/src/main/java/com/multicraft/game/dialogs/ConnectionDialog.kt b/Android/app/src/main/java/com/multicraft/game/dialogs/ConnectionDialog.kt
new file mode 100644
index 000000000..35bd8257b
--- /dev/null
+++ b/Android/app/src/main/java/com/multicraft/game/dialogs/ConnectionDialog.kt
@@ -0,0 +1,96 @@
+/*
+MultiCraft
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 3.0 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+package com.multicraft.game.dialogs
+
+import android.app.Activity
+import android.content.Context
+import android.content.res.Configuration
+import android.os.Bundle
+import android.telephony.TelephonyManager
+import android.telephony.TelephonyManager.SIM_STATE_READY
+import android.view.View
+import android.widget.LinearLayout
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import com.multicraft.game.databinding.ConnectionDialogBinding
+import com.multicraft.game.helpers.ApiLevelHelper.isOreo
+import com.multicraft.game.helpers.makeFullScreen
+import org.libsdl.app.SDLActivity
+
+class ConnectionDialog : AppCompatActivity() {
+ private fun isSimCardPresent(): Boolean {
+ val telephonyManager = getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+
+ if (!isOreo())
+ return telephonyManager.simState == SIM_STATE_READY
+
+ val isFirstSimPresent = telephonyManager.getSimState(0) == SIM_STATE_READY
+ val isSecondSimPresent = telephonyManager.getSimState(1) == SIM_STATE_READY
+
+ return isFirstSimPresent || isSecondSimPresent
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ val binding = ConnectionDialogBinding.inflate(layoutInflater)
+ if (SDLActivity.isTablet()) {
+ val param = LinearLayout.LayoutParams(
+ 0,
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ 0.5f
+ )
+ binding.connRoot.layoutParams = param
+ }
+ if (isSimCardPresent())
+ binding.mobile.visibility = View.VISIBLE
+ setContentView(binding.root)
+
+ onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+ override fun handleOnBackPressed() {
+ }
+ })
+
+ binding.wifi.setOnClickListener {
+ setResult(Activity.RESULT_OK)
+ finish()
+ }
+ binding.mobile.setOnClickListener {
+ setResult(Activity.RESULT_FIRST_USER)
+ finish()
+ }
+ binding.ignore.setOnClickListener {
+ setResult(Activity.RESULT_CANCELED)
+ finish()
+ }
+ }
+
+ override fun onResume() {
+ super.onResume()
+ window.makeFullScreen()
+ }
+
+ override fun attachBaseContext(base: Context?) {
+ val configuration = Configuration(base?.resources?.configuration)
+ configuration.fontScale = 1.0f
+ applyOverrideConfiguration(configuration)
+ super.attachBaseContext(base)
+ }
+}
diff --git a/Android/app/src/main/java/com/multicraft/game/dialogs/RestartDialog.kt b/Android/app/src/main/java/com/multicraft/game/dialogs/RestartDialog.kt
new file mode 100644
index 000000000..733fd6a74
--- /dev/null
+++ b/Android/app/src/main/java/com/multicraft/game/dialogs/RestartDialog.kt
@@ -0,0 +1,76 @@
+/*
+MultiCraft
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 3.0 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+package com.multicraft.game.dialogs
+
+import android.app.Activity
+import android.content.Context
+import android.content.res.Configuration
+import android.os.Bundle
+import android.widget.LinearLayout
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import com.multicraft.game.databinding.RestartDialogBinding
+import com.multicraft.game.helpers.makeFullScreen
+import org.libsdl.app.SDLActivity
+
+class RestartDialog : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ val binding = RestartDialogBinding.inflate(layoutInflater)
+ if (SDLActivity.isTablet()) {
+ val param = LinearLayout.LayoutParams(
+ 0,
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ 0.5f
+ )
+ binding.restartRoot.layoutParams = param
+ }
+ setContentView(binding.root)
+
+ onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+ override fun handleOnBackPressed() {
+ }
+ })
+
+ val message = intent.getStringExtra("message")!!
+ binding.errorDesc.text = message
+ binding.restart.setOnClickListener {
+ setResult(Activity.RESULT_OK)
+ finish()
+ }
+ binding.close.setOnClickListener {
+ setResult(Activity.RESULT_CANCELED)
+ finish()
+ }
+ }
+
+ override fun onResume() {
+ super.onResume()
+ window.makeFullScreen()
+ }
+
+ override fun attachBaseContext(base: Context?) {
+ val configuration = Configuration(base?.resources?.configuration)
+ configuration.fontScale = 1.0f
+ applyOverrideConfiguration(configuration)
+ super.attachBaseContext(base)
+ }
+}
diff --git a/Android/app/src/main/java/com/multicraft/game/helpers/ApiLevelHelper.kt b/Android/app/src/main/java/com/multicraft/game/helpers/ApiLevelHelper.kt
index 10110b846..380760dd7 100644
--- a/Android/app/src/main/java/com/multicraft/game/helpers/ApiLevelHelper.kt
+++ b/Android/app/src/main/java/com/multicraft/game/helpers/ApiLevelHelper.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -30,5 +30,7 @@ object ApiLevelHelper {
fun isOreo() = isGreaterOrEqual(O)
+ fun isPie() = isGreaterOrEqual(P)
+
fun isAndroid12() = isGreaterOrEqual(S)
}
diff --git a/Android/app/src/main/java/com/multicraft/game/helpers/PreferenceHelper.kt b/Android/app/src/main/java/com/multicraft/game/helpers/PreferenceHelper.kt
index 8080789af..11626b39f 100644
--- a/Android/app/src/main/java/com/multicraft/game/helpers/PreferenceHelper.kt
+++ b/Android/app/src/main/java/com/multicraft/game/helpers/PreferenceHelper.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/Android/app/src/main/java/com/multicraft/game/helpers/UsefulExtensions.kt b/Android/app/src/main/java/com/multicraft/game/helpers/UsefulExtensions.kt
index 966541f2b..a4f0a79aa 100644
--- a/Android/app/src/main/java/com/multicraft/game/helpers/UsefulExtensions.kt
+++ b/Android/app/src/main/java/com/multicraft/game/helpers/UsefulExtensions.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -23,31 +23,22 @@ package com.multicraft.game.helpers
import android.app.*
import android.content.Context
import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
-import android.provider.Settings
-import android.view.View
+import android.content.res.Configuration
+import android.net.*
+import android.os.*
import android.view.Window
-import androidx.appcompat.app.AlertDialog
+import androidx.activity.result.ActivityResultLauncher
import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
import androidx.core.view.*
-import com.multicraft.game.R
-import com.multicraft.game.databinding.ConnDialogBinding
-import com.multicraft.game.databinding.RestartDialogBinding
+import com.multicraft.game.*
+import com.multicraft.game.databinding.*
+import com.multicraft.game.dialogs.RestartDialog
import com.multicraft.game.helpers.ApiLevelHelper.isAndroid12
-import java.io.File
-import java.io.InputStream
-import kotlin.system.exitProcess
+import com.multicraft.game.helpers.ApiLevelHelper.isMarshmallow
+import java.io.*
+import java.util.*
// Activity extensions
-fun AppCompatActivity.getIcon() = try {
- packageManager.getApplicationIcon(packageName)
-} catch (e: PackageManager.NameNotFoundException) {
- ContextCompat.getDrawable(this, R.mipmap.ic_launcher)
-}
-
fun Activity.finishApp(restart: Boolean) {
if (restart) {
val intent = Intent(this, this::class.java)
@@ -61,72 +52,12 @@ fun Activity.finishApp(restart: Boolean) {
)
)
}
- exitProcess(0)
+ finish()
}
-fun AppCompatActivity.defaultDialog(title: Int, view: View, style: Int = R.style.CustomDialog): AlertDialog {
- val builder = AlertDialog.Builder(this, style)
- .setIcon(getIcon())
- .setTitle(title)
- .setCancelable(false)
- .setView(view)
- return builder.create()
-}
-
-fun AppCompatActivity.headlessDialog(
- view: View,
- style: Int = R.style.LightTheme,
- isCancelable: Boolean = false
-): AlertDialog {
- val builder = AlertDialog.Builder(this, style)
- .setCancelable(isCancelable)
- .setView(view)
- return builder.create()
-}
-
-fun AppCompatActivity.show(dialog: AlertDialog) {
- window?.makeFullScreen()
- if (!isFinishing) dialog.show()
-}
-
-fun AppCompatActivity.showConnectionDialog(listener: (() -> Unit)? = null) {
- val binding = ConnDialogBinding.inflate(layoutInflater)
- val dialog = defaultDialog(R.string.conn_title, binding.root)
- binding.wifi.setOnClickListener {
- dialog.dismiss()
- startActivityForResult(
- Intent(Settings.ACTION_WIFI_SETTINGS),
- 104
- )
- }
- binding.mobile.setOnClickListener {
- dialog.dismiss()
- startActivityForResult(
- Intent(Settings.ACTION_WIRELESS_SETTINGS),
- 104
- )
- }
- binding.ignore.setOnClickListener {
- dialog.dismiss()
- listener?.invoke()
- }
- show(dialog)
-}
-
-fun AppCompatActivity.showRestartDialog(isRestart: Boolean = true) {
- val message =
- if (isRestart) getString(R.string.restart) else getString(R.string.no_space)
- val binding = RestartDialogBinding.inflate(layoutInflater)
- val dialog = headlessDialog(binding.root, R.style.CustomDialog)
- binding.errorDesc.text = message
- binding.close.setOnClickListener { finishApp(false) }
- binding.restart.setOnClickListener { finishApp(true) }
- show(dialog)
-}
-
-fun AppCompatActivity.isConnected(): Boolean {
+fun Activity.isConnected(): Boolean {
val cm = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
- if (ApiLevelHelper.isMarshmallow()) {
+ if (isMarshmallow()) {
val activeNetwork = cm.activeNetwork ?: return false
val capabilities = cm.getNetworkCapabilities(activeNetwork) ?: return false
return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
@@ -136,6 +67,20 @@ fun AppCompatActivity.isConnected(): Boolean {
}
}
+fun AppCompatActivity.showRestartDialog(
+ startForResult: ActivityResultLauncher,
+ isRestart: Boolean = true
+) {
+ val message =
+ if (isRestart) getString(R.string.restart) else getString(R.string.no_space)
+ val intent = Intent(this, RestartDialog::class.java)
+ intent.putExtra("message", message)
+ startForResult.launch(intent)
+}
+
+fun Activity.hasHardKeyboard() =
+ resources.configuration.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO
+
// Other extensions
fun File.copyInputStreamToFile(inputStream: InputStream) =
outputStream().use { fileOut -> inputStream.copyTo(fileOut, 8192) }
diff --git a/Android/app/src/main/java/com/multicraft/game/workmanager/UnzipWorker.kt b/Android/app/src/main/java/com/multicraft/game/workmanager/UnzipWorker.kt
index b9d71100a..6fe878965 100644
--- a/Android/app/src/main/java/com/multicraft/game/workmanager/UnzipWorker.kt
+++ b/Android/app/src/main/java/com/multicraft/game/workmanager/UnzipWorker.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -26,6 +26,7 @@ import android.content.Context
import android.content.Context.NOTIFICATION_SERVICE
import androidx.core.app.NotificationCompat
import androidx.work.*
+import com.multicraft.game.MainActivity.Companion.NO_SPACE_LEFT
import com.multicraft.game.R
import com.multicraft.game.helpers.ApiLevelHelper.isOreo
import com.multicraft.game.helpers.copyInputStreamToFile
@@ -83,7 +84,7 @@ class UnzipWorker(private val appContext: Context, workerParams: WorkerParameter
}
Result.success()
} catch (e: IOException) {
- val isNotEnoughSpace = e.localizedMessage!!.contains("ENOSPC")
+ val isNotEnoughSpace = e.localizedMessage!!.contains(NO_SPACE_LEFT)
val out = Data.Builder()
.putBoolean("restart", !isNotEnoughSpace)
.build()
diff --git a/Android/app/src/main/java/com/multicraft/game/workmanager/WorkerViewModel.kt b/Android/app/src/main/java/com/multicraft/game/workmanager/WorkerViewModel.kt
index 2601e56fb..1362df6ff 100644
--- a/Android/app/src/main/java/com/multicraft/game/workmanager/WorkerViewModel.kt
+++ b/Android/app/src/main/java/com/multicraft/game/workmanager/WorkerViewModel.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/Android/app/src/main/java/com/multicraft/game/workmanager/WorkerViewModelFactory.kt b/Android/app/src/main/java/com/multicraft/game/workmanager/WorkerViewModelFactory.kt
index d47d44182..861c4076e 100644
--- a/Android/app/src/main/java/com/multicraft/game/workmanager/WorkerViewModelFactory.kt
+++ b/Android/app/src/main/java/com/multicraft/game/workmanager/WorkerViewModelFactory.kt
@@ -1,7 +1,7 @@
/*
MultiCraft
-Copyright (C) 2014-2022 MoNTE48, Maksim Gamarnik
-Copyright (C) 2014-2022 ubulem, Bektur Mambetov
+Copyright (C) 2014-2023 MoNTE48, Maksim Gamarnik
+Copyright (C) 2014-2023 ubulem, Bektur Mambetov
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/Android/app/src/main/java/org/libsdl/app/SDLActivity.java b/Android/app/src/main/java/org/libsdl/app/SDLActivity.java
index 2e25d787e..264fc1842 100644
--- a/Android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/Android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
private static final String TAG = "SDL";
private static final int SDL_MAJOR_VERSION = 2;
private static final int SDL_MINOR_VERSION = 28;
- private static final int SDL_MICRO_VERSION = 2;
+ private static final int SDL_MICRO_VERSION = 4;
/*
// Display InputType.SOURCE/CLASS of events and devices
//
diff --git a/Android/app/src/main/res/anim/slide_in_bottom.xml b/Android/app/src/main/res/anim/slide_in_bottom.xml
new file mode 100644
index 000000000..7d71ec0dc
--- /dev/null
+++ b/Android/app/src/main/res/anim/slide_in_bottom.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/Android/app/src/main/res/anim/slide_in_top.xml b/Android/app/src/main/res/anim/slide_in_top.xml
new file mode 100644
index 000000000..2590b13cb
--- /dev/null
+++ b/Android/app/src/main/res/anim/slide_in_top.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/Android/app/src/main/res/anim/slide_out_bottom.xml b/Android/app/src/main/res/anim/slide_out_bottom.xml
new file mode 100644
index 000000000..ee271ddfd
--- /dev/null
+++ b/Android/app/src/main/res/anim/slide_out_bottom.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/Android/app/src/main/res/anim/slide_out_top.xml b/Android/app/src/main/res/anim/slide_out_top.xml
new file mode 100644
index 000000000..139262fe4
--- /dev/null
+++ b/Android/app/src/main/res/anim/slide_out_top.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/Android/app/src/main/res/drawable-night/bg_input.xml b/Android/app/src/main/res/drawable-night/bg_input.xml
index afda4958d..1a72c7e0b 100644
--- a/Android/app/src/main/res/drawable-night/bg_input.xml
+++ b/Android/app/src/main/res/drawable-night/bg_input.xml
@@ -2,4 +2,7 @@
+
diff --git a/Android/app/src/main/res/drawable/btn_green.xml b/Android/app/src/main/res/drawable/btn_green.xml
new file mode 100644
index 000000000..da8f7ac66
--- /dev/null
+++ b/Android/app/src/main/res/drawable/btn_green.xml
@@ -0,0 +1,5 @@
+
+
+