v0.3.0

.gitignore

@@ -1,5 +1,5 @@
-# Python stuff
+# Old stuff
+.old/
 
-__pycache__/
-build/
+# Builds
 *.pyc

README.md

@@ -7,30 +7,42 @@ A simple launcher for Minecraft: Pi Edition.
 
 ## Getting started
 ### Prerequisites
-To use MCPIL you need to have `Python >= 3.7.x` pre-installed and root privileges.
+To use MCPIL you need to have Python 3.7 pre-installed.
 
 ### Installation
-To install MCPIL, download or clone the repository:
+To install MCPIL, download or clone the repository and run the `build.py` file in the root of the repo:
 ```shell
-git clone https://github.com/Alvarito050506/MCPIL.git
+git clone https://github.com/MCPI-Devs/MCPIL.git
+cd ./MCPIL/
+python3.7 ./build.py
 ```
-and then run the `install.py` file. It will create a desktop file that you can access in the "Games" category.
+It will generate a `install.pyc` file under the `build` directory, run it:
+```shell
+cd ./build/
+python3.7 ./install.pyc
+```
+It will "install" MCPI and MCPE, and configure the Launcher.
 
 ## Features
 + Switch between Minecraft Pi and PE
-+ Username change
-+ Skin change
-+ Mod load
++ Username changing
++ Skin changing
++ Mod loading
 + Mod API
 + Mod compilation
-+ World game mode and name change
++ World setting (game mode and name) changing
 + Join non-local servers
-+ Coming soon: Pi Realms
++ Coming soon: More stuff
 
 ## Usage
-Launch the MCPIL desktop file or run the `mcpil.py` file to see the magick! :wink:
+Launch the MCPIL desktop file or run the `mcpil.pyc` file in the `build` folder as following to see the magic! :wink:
+```shell
+python3.7 ./mcpil.pyc
+```
 
 ## API
+**Warning**: The API will be refactored in the next release.
+
 There is an MCPIL API that you can use by importing the `mcpil` module into your Python mod. It exposes the following functions:
 
 ### `def get_user_name()`
@@ -47,9 +59,9 @@ Returns the game mode of the current world as an interger:
 ## Mod compilation
 To compile (compress) a Python mod, run the `mcpim.py` file passing the filename of the mod as the first argument. For example:
 ```shell
-./mcpim.py example.py
+python3.7 ./mcpim.pyc example.py
 ```
-will produce a `example.mcpi` mod file.
+This will produce an `example.mcpi` mod file.
 
 ## Thanks
 To [@Phirel](https://www.minecraftforum.net/members/Phirel) for his Pi2PE (a.k.a. "survival") patch.

mcpip.py → build.py

@@ -1,7 +1,7 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.7
 # -*- coding: utf-8 -*-
 #
-#  mcpip.py
+#  build.py
 #  
 #  Copyright 2020 Alvarito050506 <donfrutosgomez@gmail.com>
 #  
@@ -21,32 +21,18 @@
 #  
 #  
 
-
 import sys
-import socket
+import py_compile
+import glob
+from os import chdir
 
 def main(args):
-	ss = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP);
-	sc = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP);
-	server = (args[1], int(args[2]));
-	client = ("0.0.0.0", 19134);
-	sc.setblocking(0);
-	ss.setblocking(0);
-	sc.bind(client);
-	client_addr = None;
-
-	while True:
-		try:
-			data, addr = ss.recvfrom(16384);
-			sc.sendto(data, client_addr);
-		except BlockingIOError:
-			pass;
-		try:
-			data, addr = sc.recvfrom(16384);
-			client_addr = addr;
-			ss.sendto(data, server);
-		except BlockingIOError:
-			pass;
+	src = glob.glob("./src/*.py");
+	i = 0;
+	while i < len(src):
+		py_compile.compile(src[i], cfile="./build/" + src[i].replace("./src", "").replace(".py", ".pyc"), optimize=2);
+		i += 1;
+
 	return 0;
 
 if __name__ == '__main__':

build/minecraft/LICENSE.txt

@@ -0,0 +1,6 @@
+*** The real license isn't finished yet, here's what goes in plain english ***
+
+You may execute the minecraft-pi binary on a Raspberry Pi or an emulator
+You may use any of the source code included in the distribution for any purpose (except evil)
+
+You may not redistribute any modified binary parts of the distribution

build/minecraft/lib/mesa/libEGL.so

@@ -0,0 +1 @@
+/usr/lib/arm-linux-gnueabihf/libEGL.so.1

build/minecraft/lib/mesa/libGLESv2.so

@@ -0,0 +1 @@
+/usr/lib/arm-linux-gnueabihf/libGLESv2.so.2

.install_files/minecraft-pe → build/minecraft/minecraft-pe.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 
-cd /opt/minecraft-pi || exit
+cd $HOME/.mcpil/minecraft || exit
 
 if grep -q okay /proc/device-tree/soc/v3d@7ec00000/status \
 	/proc/device-tree/soc/firmwarekms@7e600000/status 2> /dev/null; then
 	export LD_PRELOAD=libbcm_host.so.1.0
-	export LD_LIBRARY_PATH=lib/mesa
+	export LD_LIBRARY_PATH=./lib/mesa
 else
-	export LD_LIBRARY_PATH=lib/brcm
+	export LD_LIBRARY_PATH=./lib/brcm
 fi
 
 ./minecraft-pe

build/minecraft/minecraft-pi.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+cd $HOME/.mcpil/minecraft || exit
+
+if grep -q okay /proc/device-tree/soc/v3d@7ec00000/status \
+	/proc/device-tree/soc/firmwarekms@7e600000/status 2> /dev/null; then
+	export LD_PRELOAD=libbcm_host.so.1.0
+	export LD_LIBRARY_PATH=./lib/mesa
+else
+	export LD_LIBRARY_PATH=./lib/brcm
+fi
+
+./minecraft-pi

.install_files/tk.mcpi.mcpil.desktop → build/res/tk.mcpi.mcpil.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=MCPIL
 Comment=Minecraft Pi Launcher
-Exec=$(EXECUTABLE_PATH) %f
+Exec=$(EXECUTABLE_PATH)
 Icon=mcpil
 Terminal=false
 Type=Application

example.py

@@ -1,4 +1,26 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.7
+# -*- coding: utf-8 -*-
+#
+#  example.py
+#  
+#  Copyright 2020 Alvarito050506 <donfrutosgomez@gmail.com>
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#  
+#  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 General Public License for more details.
+#  
+#  You should have received a copy of the GNU 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.
+#  
+#  
+
 
 import sys
 import time

api/mcpil/__init__.py → src/api/mcpil/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.7
 # -*- coding: utf-8 -*-
 #
 #  __init__.py

api/setup.py → src/api/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.7
 # -*- coding: utf-8 -*-
 #
 #  setup.py
@@ -21,17 +21,22 @@
 #  
 #  
 
-from distutils.core import setup
-from os import chdir, path
-
-chdir(path.dirname(__file__));
+from setuptools import setup, find_packages
 
 setup(
 	name="mcpil",
 	version="v0.1.1",
-	description="MCPI API extensions",
+	description="MCPI API extensions.",
 	author="Alvarito050506",
+	author_email="donfrutosgomez@gmail.com",
+	url="https://github.com/Alvarito050506/MCPIL",
+	project_urls={
+		"Bug Tracker": "https://github.com/Alvarito050506/MCPIL/issues",
+		"Documentation": "https://github.com/Alvarito050506/MCPIL#readme",
+		"Source Code": "https://github.com/Alvarito050506/MCPIL",
+	},
 	packages=["mcpil"],
+	install_requires=["psutil>=5.7.0"],
 	classifiers=[
 		"Development Status :: 3 - Alpha",
 		"Environment :: Console",

src/install.py

@@ -0,0 +1,59 @@
+#!/usr/bin/env python3.7
+# -*- coding: utf-8 -*-
+#
+#  install.py
+#  
+#  Copyright 2020 Alvarito050506 <donfrutosgomez@gmail.com>
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#  
+#  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 General Public License for more details.
+#  
+#  You should have received a copy of the GNU 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.
+#  
+#  
+
+import subprocess
+import sys
+from os import uname, getenv, path, makedirs, mkdir, getcwd, chdir
+import shutil
+
+def main():
+	if "arm" not in uname()[4] and "aarch" not in uname()[4]:
+		sys.stdout.write("Error: Minecraft Pi Launcher must run on a Raspberry Pi.\n");
+		return 1;
+
+	sizes = ["16", "32", "48", "64", "128"];
+	chdir(path.dirname(path.realpath(__file__)));
+
+	if not path.exists(getenv("HOME") + "/.mcpil"):
+		subprocess.call(["pip3.7", "install", "--user", "-qq", "psutil"]);
+		subprocess.call(["python3.7", "../src/api/setup.py", "-q", "install"]);
+		if not path.exists(getenv("HOME") + "/.local/share/applications"):
+			makedirs(getenv("HOME") + "/.local/share/applications");
+		i = 0;
+		while i < len(sizes):
+			subprocess.call(["xdg-icon-resource", "install", "--novendor", "--size", sizes[i], "./res/application-x-mcpimod_" + sizes[i] + "px.png", "application-x-mcpimod"]);
+			subprocess.call(["xdg-icon-resource", "install", "--novendor", "--size", sizes[i], "./res/mcpil_" + sizes[i] + "px.png", "mcpil"]);
+			i += 1;
+		subprocess.call(["xdg-mime", "install", "--novendor", "./res/mcpimod.xml"]);
+		mkdir(getenv("HOME") + "/.mcpil");
+		shutil.copytree("./minecraft", getenv("HOME") + "/.mcpil/minecraft");
+		mkdir(getenv("HOME") + "/.mcpil/mods");
+		desktop_template = open("./res/tk.mcpi.mcpil.desktop", "r");
+		desktop_file = open(getenv("HOME") + "/.local/share/applications/tk.mcpi.mcpil.desktop", "w");
+		desktop_file.write(desktop_template.read().replace("$(EXECUTABLE_PATH)", "python3.7 " + getcwd() + "/mcpil.pyc"));
+		desktop_template.close();
+		desktop_file.close();
+	return 0;
+
+if __name__ == '__main__':
+	sys.exit(main());