diff --git a/.gitignore b/.gitignore index 01362f6..a6cff87 100644 --- a/.gitignore +++ b/.gitignore @@ -7,12 +7,15 @@ *.log data/minceraft/instances/1.21.4/.minecraft/authlib-injector.log data/minceraft/instances/1.21.4/.minecraft/logs -data/minecraft/* +data/minceraft/** +data/minceraft/** +data/minceraft/* data/minceraft/*/ -!data/minecraft/instances -!data/minecraft/ultimmc.cfg.def -!data/minecraft/instances/ -!data/minecraft/run_mine.sh +!data/minceraft/instances +!data/minceraft/ultimmc.cfg.def +!data/minceraft/instances/ +!data/minceraft/run_mine.sh +!data/minceraft/accounts.json output/ build/ xbps-cache diff --git a/Makefile b/Makefile index 0aa1017..302b4f9 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ clean: cp data/minceraft_tmp/ultimmc.cfg.def data/minceraft cp -r data/minceraft_tmp/instances data/minceraft cp data/minceraft_tmp/run_mine.sh data/minceraft + cp data/minceraft_tmp/accounts.json data/minceraft rm -rf data/minceraft_tmp rm -rf ultimmc/build @@ -17,7 +18,7 @@ ultimmc: data/minceraft/UltimMC data/minceraft/UltimMC: mkdir -p ultimmc/build - cd ultimmc/build && cmake \ + export JAVA_HOME=/usr/lib/jvm/openjdk8 && cd ultimmc/build && cmake \ -DCMAKE_C_COMPILER=/usr/bin/gcc \ -DCMAKE_CXX_COMPILER=/usr/bin/g++ \ -DCMAKE_BUILD_TYPE=Release \