diff --git a/.github/.typo-ci.yml b/.github/.typo-ci.yml new file mode 100644 index 0000000..7cfff9c --- /dev/null +++ b/.github/.typo-ci.yml @@ -0,0 +1,31 @@ +# This is a sample .typo-ci.yml file, it's used to configure how Typo CI will behave. +# Add it to the root of your project and push it to github. +--- + +# What language dictionaries should it use? Currently Typo CI supports: +# de +# en +# en_GB +# es +# fr +# it +# pt +# pt_BR +dictionaries: + - en + - en_GB + +# Any files/folders we should ignore? +excluded_files: + - ".typo-ci.yml" + +# Any typos we should ignore? +excluded_words: + - typoci + - zenity + - ver + - jpv + - MCRPi + +# Would you like filenames to also be spellchecked? +spellcheck_filenames: true diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cf92455 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.github/ +.typo-ci.yml +trash/ diff --git a/Install/install b/Install/install index ff2651c..36311bc 100644 --- a/Install/install +++ b/Install/install @@ -1,27 +1,25 @@ -wget +#!/bin/bash MACHINE_TYPE=$(uname -m) -LANG=$(locale language) -ver=$(cat version.txt) +lan=$(locale language) +ver=$(wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/dev-firststage/Update/LatestVersion.txt && cat LatestVersion.txt) -if [ "$LANG" = "ja_JP" ]; then +if [ "$lan" = "ja_JP" ]; then echo "日本語に選択されました" lang=jp - fi else echo "Automatically selected to English" lang=en - fi +fi echo "Starting install script" if [ "$MACHINE_TYPE" = "aarch64" ]; then echo "Mode:aarch64 64bit" - wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/Python-v.0.1/en/install64bit + wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/release/${lang}/install64bit sudo chmod +x install64bit - ./install64bit ${lang} - fi + ./install64bit else echo "Mode:Not aarch64 32bit" - wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/Python-v.0.1/en/install32bit + wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/release/${lang}/install32bit sudo chmod +x install32bit - ./install32bit ${lang} - fi + ./install32bit +fi diff --git a/README.md b/README.md index ae307ce..8195a9d 100644 --- a/README.md +++ b/README.md @@ -53,3 +53,27 @@ wget -O install https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/Python-Late # All Release is available to check here リリースはこちらから確認可能です https://github.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/tags + + +# People +**Tama(TamaTamaGoGo)** +Leader + +-develop, debug, make script + + +**Other's** + +****RpiMike**** + +Thanks for sharing way to play Minecraft on Raspberry Pi! + + +****Youtuber**** + +Thanks for sharing way to more FPS! + + +****OptiFine Developer**** + +Thanks for developing! diff --git a/v.1.0/CHANGELOG.md b/v.1.0/CHANGELOG.md new file mode 100644 index 0000000..71214bf --- /dev/null +++ b/v.1.0/CHANGELOG.md @@ -0,0 +1,15 @@ +# ChangeLog at v.1.0 + +**2020/07/20** + +- Changed sh script + + ∟ There has big issues on script. + +* Changed the way to divide version + + ∟ Changed divide with commit to directory. + +* Add next stage of dev + + ∟ Add new first stage of dev. (dev-firststage) diff --git a/v.1.0/Install/install b/v.1.0/Install/install index 3ea93d5..70a9c00 100644 --- a/v.1.0/Install/install +++ b/v.1.0/Install/install @@ -1,12 +1,10 @@ -wget MACHINE_TYPE=$(uname -m) -LANG=$(locale language) -ver=$(cat version.txt) +lan=$(locale language) +ver=$(wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/release/Update/LatestVersion.txt && cat LatestVersion.txt) -if [ "$LANG" = "ja_JP" ]; then +if [ "$lan" = "ja_JP" ]; then echo "日本語に選択されました" lang=jp - fi else echo "Automatically selected to English" lang=en @@ -15,13 +13,12 @@ else echo "Starting install script" if [ "$MACHINE_TYPE" = "aarch64" ]; then echo "Mode:aarch64 64bit" - wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/Python-v.0.1/en/install64bit + wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/release/${lang}/install64bit sudo chmod +x install64bit - ./install64bit ${lang} - fi + ./install64bit else echo "Mode:Not aarch64 32bit" - wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/Python-v.0.1/en/install32bit + wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/release/${lang}/install32bit sudo chmod +x install32bit - ./install32bit ${lang} + ./install32bit fi diff --git a/v.1.0/Install/installist.sh b/v.1.0/Install/installist.sh new file mode 100644 index 0000000..a9bf588 --- /dev/null +++ b/v.1.0/Install/installist.sh @@ -0,0 +1 @@ +#!/bin/bash diff --git a/v.1.0/README.md b/v.1.0/README.md index 8139d85..d588404 100644 --- a/v.1.0/README.md +++ b/v.1.0/README.md @@ -2,27 +2,27 @@ # Status - 状態 -[![Forks](https://img.shields.io/github/forks/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi?label=Forks%21&style=social)](https://github.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi#status---状態) -[![Version](https://img.shields.io/badge/Version-v.1.0-lightgrey)](https://github.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/releases) -[![Status](https://img.shields.io/badge/Status-BetaVersion-red)](https://github.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/releases) +[![Forks](https://img.shields.io/github/forks/TamaTamaGoGo/MCRPi?label=Forks%21&style=social)](https://github.com/TamaTamaGoGo/MCRPi#status---状態) +[![Version](https://img.shields.io/badge/Version-v.1.0-lightgrey)](https://github.com/TamaTamaGoGo/MCRPi/releases) +[![Status](https://img.shields.io/badge/Status-BetaVersion-red)](https://github.com/TamaTamaGoGo/MCRPi/releases) ![Size](https://img.shields.io/github/repo-size/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi) **Issues - 問題** -[![IssueOpen](https://img.shields.io/github/issues-raw/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi?color=red)](https://github.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/issues?q=is%3Aopen+is%3Aissue) -[![IssueClose](https://img.shields.io/github/issues-closed-raw/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi)]() +[![IssueOpen](https://img.shields.io/github/issues-raw/TamaTamaGoGo/MCRPi?color=red)](https://github.com/TamaTamaGoGo/MCRPi/issues?q=is%3Aopen+is%3Aissue) +[![IssueClose](https://img.shields.io/github/issues-closed-raw/TamaTamaGoGo/MCRPi)]() **Code Review - コード評価** -[![CodeFactor](https://www.codefactor.io/repository/github/tamatamagogo/mcrpi/badge/python-latest)](https://www.codefactor.io/repository/github/tamatamagogo/mcrpi/overview/python-latest) +[![CodeFactor](https://www.codefactor.io/repository/github/tamatamagogo/mcrpi/badge/release)](https://www.codefactor.io/repository/github/tamatamagogo/mcrpi/overview/release) **A**->Fine 良い **B**->Some big issue 大きい問題が少しあります **C**->Many big issue 大きい問題が多数あります **Detail - 詳細** -[![MileStone](https://img.shields.io/badge/MileStone-20%25-9cf)](https://github.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi#status---状態) -![change](https://img.shields.io/github/commit-activity/m/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi) +[![MileStone](https://img.shields.io/badge/MileStone-20%25-9cf)](https://github.com/TamaTamaGoGo/MCRPi#status---状態) +![change](https://img.shields.io/github/commit-activity/m/TamaTamaGoGo/MCRPi) # Readme.md is available for **English**・**日本語**で閲覧できます @@ -41,13 +41,13 @@ Goto folder where you want to install **Method 1** ```Shell -curl -L https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/Python-Latest/Install/install | bash +curl -L https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/release/Install/install | bash ``` **Method 2** ```Shell -wget -O install https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/Python-Latest/Install/install && sudo chmod 777 install && ./install +wget -O install https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/release/Install/install && sudo chmod 777 install && ./install ``` # All Release is available to check here リリースはこちらから確認可能です diff --git a/v.1.0/jp/README.md b/v.1.0/jp/README.md.old similarity index 100% rename from v.1.0/jp/README.md rename to v.1.0/jp/README.md.old diff --git a/v.1.0/jp/install32bit.sh b/v.1.0/jp/install32bit.sh index 7003620..63e98bf 100644 --- a/v.1.0/jp/install32bit.sh +++ b/v.1.0/jp/install32bit.sh @@ -1,92 +1,75 @@ #!/bin/sh -( - - ##Information - echo "MCRPiは、Bash、Python、Tkinterを使用します" - - #pre zenity - echo Installing python-3.8 - sleep 1 - sudo apt-get install -y python-3.8 - sleep 1 - dir=$PWD - - echo "# $dirにディレクトリーを作成しています" - ##zenity --progress --time-remaining --text='Install and Initialize MCPi \nIt only takes minutes \nPlease wait...' - cd "$dir" - echo "2" - mkdir MCRPi - sleep 1 - echo "4" - mkdir .minecraft - sleep 1 - echo "6" - mkdir Minecraft - sleep 1 - echo "8" - mkdir jdk - sleep 1 - echo "10" - - echo "# GitHubからダウンロードスクリプトをダウンロードしています" - sudo wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/master/jp/download/download1.sh - sudo wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/master/jp/download/download2.sh - sudo wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/master/en/download/download3.sh - #cd Minecraft - - ####Downloading MCPi Core from GITHUB's Repository -Nope - echo "# Minecraftの公式ランチャーをダウンロードしています" - #lxterminal --working-directory=${dir}/Minecraft -e wget https://launcher.mojang.com/v1/objects/eabbff5ff8e21250e33670924a0c5e38f47c840b/launcher.jar 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-kill --title="Downloading File..." ; exit - sudo chmod +x download1.sh - ./download1.sh - echo "15" - - echo "# mesa-utilsをインストールしています" - sudo apt-get install -y mesa-utils - echo "20" - - echo "# リポジトリーを使わずにJava 8をインストールしています" - if [ ! -f jdk-8u241-linux-arm32-vfp-hflt.tar.gz ]; then - # lxterminal --working-directory=${dir}/jdk -e wget https://www.dropbox.com/s/h6smy7w7dsikdis/jdk-8u241-linux-arm32-vfp-hflt.tar.gz 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-kill --title="Downloading File..." - sudo chmod +x download2.sh - ./download2.sh - fi - - echo "25" - - echo "# 展開しています" - sudo tar -zxf jdk-8u241-linux-arm32-vfp-hflt.tar.gz -C /jdk - - #echo "# Installing oracle java8 using repo" - #sudo apt-get install openjdk-8-jdk - - echo "# lwjgl3arm32を準備しています" - if [ ! -d ~/lwjgl3arm32 ]; then - mkdir ~/lwjgl3arm32 - fi - echo "30" - - echo "# Minecraft Server 1.15.2をダウンロードしています" - mkdir MinecraftServer - #cd MinecraftServer - #lxterminal --working-directory=${dir}/MinecraftServer -e wget https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-kill --title="Downloading File..." - #/jdk/jdk1.8.0_241/bin/java -Xmx500M -Xms500M -jar minecraft_server.1.15.2.jar nogui - sudo chmod +x download3.sh - ./download3.sh - echo "35" - - echo "# change GPU memory" - sudo bash -c "echo gpu_mem=248>> /boot/config.txt" - sudo sed -i -e "s/^gpu_mem=.*/gpu_mem=248/g" /boot/config.txt - echo "40" - -) | - zenity --progress \ - --time-remaining --text='Install and Initalize MCRPi \nIt only takes minutes \nPlease Wait...\n' --auto-kill --percentage=0 --title='install and Initalize MCRPi' - -if [ "$?" = -1 ]; then - zenity --error \ - --text="Setting canceled" - #--text="Error Occured \nBut Don't give up \nLet's try again." -fi +##Information +echo "MCRPiは、Bash、Python、Tkinterを使用します" + +#pre zenity +echo Installing python-3.8 +sleep 1 +sudo apt-get install -y python-3.8 +sleep 1 +dir=$PWD + +echo "$dirにディレクトリーを作成しています" +##zenity --progress --time-remaining --text='Install and Initialize MCPi \nIt only takes minutes \nPlease wait...' +cd "$dir" +mkdir MCRPi +mkdir .minecraft +mkdir Minecraft +mkdir jdk + +echo "GitHubからダウンロードスクリプトをダウンロードしています" +# sudo wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/master/jp/download/download1.sh +# sudo wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/master/jp/download/download2.sh +# sudo wget https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi---MineCraft-for-RaspberryPi/master/en/download/download3.sh +#cd Minecraft +wget -O download https://raw.githubusercontent.com/TamaTamaGoGo/MCRPi/release/v1.0/install/installist.sh +sudo chmod +x download +echo "ダウンロードスクリプトを実行しています" +./download + +####Downloading MCPi Core from GITHUB's Repository -Nope +echo "# Minecraftの公式ランチャーをダウンロードしています" +#lxterminal --working-directory=${dir}/Minecraft -e wget https://launcher.mojang.com/v1/objects/eabbff5ff8e21250e33670924a0c5e38f47c840b/launcher.jar 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-kill --title="Downloading File..." ; exit +sudo chmod +x download1.sh +./download1.sh +echo "15" + +echo "# mesa-utilsをインストールしています" +sudo apt-get install -y mesa-utils +echo "20" + +#echo "# リポジトリーを使わずにJava 8をインストールしています" +# if [ ! -f jdk-8u241-linux-arm32-vfp-hflt.tar.gz ]; then +# # lxterminal --working-directory=${dir}/jdk -e wget https://www.dropbox.com/s/h6smy7w7dsikdis/jdk-8u241-linux-arm32-vfp-hflt.tar.gz 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-kill --title="Downloading File..." +# sudo chmod +x download2.sh +# ./download2.sh +# fi + +echo "25" + +# echo "# 展開しています" +# sudo tar -zxf jdk-8u241-linux-arm32-vfp-hflt.tar.gz -C /jdk + +#echo "# Installing oracle java8 using repo" +#sudo apt-get install openjdk-8-jdk + +# echo "# lwjgl3arm32を準備しています" +# if [ ! -d ~/lwjgl3arm32 ]; then +# mkdir ~/lwjgl3arm32 +# fi +echo "30" + +# echo "# Minecraft Server 1.15.2をダウンロードしています" +# mkdir MinecraftServer +#cd MinecraftServer +#lxterminal --working-directory=${dir}/MinecraftServer -e wget https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-kill --title="Downloading File..." +#/jdk/jdk1.8.0_241/bin/java -Xmx500M -Xms500M -jar minecraft_server.1.15.2.jar nogui +# sudo chmod +x download3.sh +# ./download3.sh +# echo "35" + +echo "# change GPU memory" +# sudo bash -c "echo gpu_mem=248>> /boot/config.txt" +# sudo sed -i -e "s/^gpu_mem=.*/gpu_mem=248/g" /boot/config.txt +echo "40"