Monthly Pull from Dev Branch - May 2022

.gitignore

@@ -1,7 +1,16 @@
 vitrix/lib/__pycache__/
 vitrix/__pycache__/
+vitrix/lib/__pycache__/
+vitrix/lib/weapons/__pycache__/
+vitrix/lib/items/__pycache__/
+vitrix/lib/UI/__pycache__/
+vitrix/lib/entities/__pycache__/
+vitrix/lib/classes/__pycache__/
+vitrix/test.py
+vitrix_engine.egg-info/
 venvs-config/
 data.txt
 build/
 dist/
 test/
+ib.cfg

build.py

@@ -5,6 +5,7 @@
 import platform
 import subprocess
 
+from os.path import join
 
 
 def run(command, output=1):
@@ -32,9 +33,8 @@ def print_seperator():
 
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
-build_path = dir_path + "/build"
+build_path = join(dir_path, "build")
 d = datetime.datetime.now()
-vitrix_ver = d.strftime("%m-%Y")
 
 if platform.system() == "Linux":
     operating_sys = "linux"
@@ -64,55 +64,38 @@ def print_seperator():
 start_time = time.time()
 print("Building...\n\n")
 
-with open(dir_path + "/requirements.txt") as file:
+with open(join(dir_path, "requirements.txt")) as file:
     packages = file.readlines()
 
 if operating_sys == "linux":
     from venvctl import VenvCtl
 
     VenvCtl.create_venv(name="python-env", packages=packages,
                         output_dir=build_path)
-    shutil.rmtree(build_path + "/builds")
-    shutil.rmtree(build_path + "/reports")
-    shutil.copy("data/linux/vitrix.sh", "build")
-
-    shutil.copytree(dir_path + "/vitrix", build_path + "/src", 
-                ignore=shutil.ignore_patterns("__pycache__"))
-    os.remove(build_path + "/src/.unbuilt")
+    shutil.rmtree(join(build_path, "builds"))
+    shutil.rmtree(join(build_path, "reports"))
+    shutil.copy(join("data", "linux", "vitrix.sh"), "build")
+    shutil.copy(join("data", "linux", "singleplayer.sh"), "build")
+    shutil.copy(join("data", "linux", "multiplayer.sh"), "build")
+
 
 if operating_sys == "windows":
-    run("python -m ursina.build")
-
-    folders_to_remove = [
-        "/src/data",
-        "/src/server",
-        "/src/test",
-        "/src/.github"
-    ]
-
-    files_to_remove = [
-        "/src/build.pyc",
-        "/src/LICENSE",
-        "/src/logo.png",
-        "/src/requirements.txt",
-        "/src/SECURITY.md",
-        "/src/README.md",
-        "/src/vitrix/.unbuilt",
-        "/Vitrix.bat"
-    ]
-
-
-    for item in folders_to_remove:
-        shutil.rmtree(build_path + item)
-
-    for item in files_to_remove:
-        os.remove(build_path + item)
+    from zipfile import ZipFile
+
+    with ZipFile(join(dir_path, "data", "windows", "python-windows.zip"), "r") as zip:
+        zip.extractall(build_path)
 
-    shutil.copy(dir_path + "/data/windows/vitrix.bat", build_path)
-    shutil.copy(dir_path + "/data/windows/singleplayer.bat", build_path)
-    shutil.copy(dir_path + "/data/windows/multiplayer.bat", build_path)
 
-pkg_name = "Vitrix_" + vitrix_ver + "_" + operating_sys
+    shutil.copy(join("data", "windows", "vitrix.bat"), "build")
+    shutil.copy(join("data", "windows", "singleplayer.bat"), "build")
+    shutil.copy(join("data", "windows", "multiplayer.bat"), "build")
+
+
+shutil.copytree(join(dir_path, "vitrix"), join(build_path, "vitrix"), 
+            ignore=shutil.ignore_patterns("__pycache__"))
+os.remove(f"{build_path}/src/.unbuilt")
+
+pkg_name = f"Vitrix-vX.X.X-{operating_sys}"
 
 
 shutil.make_archive(pkg_name, "zip", build_path)
@@ -124,4 +107,4 @@ def print_seperator():
 print_seperator()
 print("Build Successfully Completed!")
 print("Finished On:     " + d.strftime("%I:%M %p %A %B %Y"))
-print("\nTotal Build Time:      " + str(time.time() - start_time) + " seconds")
+print(f"\nTotal Build Time:      {str(time.time() - start_time)} seconds")

data/linux/multiplayer.sh

@@ -2,4 +2,4 @@
 
 DIR=$(dirname "$0")
 
-$DIR/python-env/bin/python3 $DIR/vitrix/multiplayer.py
+$DIR/python-env/bin/python3 $DIR/src/multiplayer.py

data/linux/singleplayer.sh

@@ -2,4 +2,4 @@
 
 DIR=$(dirname "$0")
 
-$DIR/python-env/bin/python3 $DIR/vitrix/singleplayer.py
+$DIR/python-env/bin/python3 $DIR/src/singleplayer.py

data/linux/vitrix.sh

@@ -2,4 +2,4 @@
 
 DIR=$(dirname "$0")
 
-$DIR/python-env/bin/python3 $DIR/vitrix/menu.py > log.txt
+$DIR/python-env/bin/python3 $DIR/src/menu.py > log.txt

data/windows/multiplayer.bat

@@ -1,4 +1,4 @@
 chcp 65001
 set PYTHONIOENCODING=utf-8
 
-call "python\python.exe" "src\vitrix\multiplayer.pyc"
+call "python\python.exe" "src\multiplayer.py"

data/windows/singleplayer.bat

@@ -1,4 +1,4 @@
 chcp 65001
 set PYTHONIOENCODING=utf-8
 
-call "python\python.exe" "src\vitrix\singleplayer.pyc"
+call "python\python.exe" "src\singleplayer.py"

data/windows/vitrix.bat

@@ -1,4 +1,5 @@
 chcp 65001
 set PYTHONIOENCODING=utf-8
+title Vitrix
 
-call "python\python.exe" "src\vitrix\menu.pyc" > "log.txt" 2>&1
+call "python\python.exe" "src\menu.py" > "log.txt" 2>&1

requirements.txt

@@ -1,7 +1,2 @@
-notify2==0.3.1
-panda3d==1.10.11
-panda3d-gltf==0.13
-panda3d-simplepbr==0.10
-Pillow==9.1.0
-screeninfo==0.8
-ursina==4.1.1
+git+https://github.com/ShadityZ/Vitrix-Engine.git@v1.0#egg=vitrix_engine
+venvctl==1.4.12

server/server.py

@@ -1,13 +1,19 @@
 """
-Server script for hosting games
+Server version:     v1.0.0
 """
 
+import os
+import sys
 import socket
 import json
 import time
 import random
 import threading
 
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from vitrix.lib.classes.anticheat import *
+#from vitrix.lib.player import Player
 
 ADDR = "0.0.0.0"
 PORT = 26822
@@ -108,7 +114,7 @@ def main():
         new_id = generate_id(players, MAX_PLAYERS)
         conn.send(new_id.encode("utf8"))
         username = conn.recv(MSG_SIZE).decode("utf8")
-        new_player_info = {"socket": conn, "username": username, "position": (0, 1, 0), "rotation": 0, "health": 100}
+        new_player_info = {"socket": conn, "username": username, "position": (0, 1, 0), "rotation": 0, "health": 150}
 
 
         for player_id in players:
@@ -152,6 +158,9 @@ def main():
 
         print(f"New connection from {addr}, assigned ID: {new_id}...")
 
+        #check_speed(Player.speed)
+        #check_jump_height(Player.jump_height, 2.5)
+
 
 if __name__ == "__main__":
     try:

vitrix/assets/models/K47.mtl

@@ -0,0 +1,10 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl None
+Ns 500
+Ka 0.8 0.8 0.8
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2