Monthly Pull from Dev Branch - June & July 2022

.gitignore

@@ -5,7 +5,7 @@ vitrix/lib/weapons/__pycache__/
 vitrix/lib/items/__pycache__/
 vitrix/lib/UI/__pycache__/
 vitrix/lib/entities/__pycache__/
-vitrix/lib/classes/__pycache__/
+vitrix/lib/api/__pycache__/
 vitrix/test.py
 vitrix_engine.egg-info/
 venvs-config/

README.md

@@ -31,11 +31,13 @@
 
 <br><br>
 
+![Vitrix 1.2.0 Singleplayer development version](https://github.com/ShadityZ/Vitrix/raw/dev/screenshot.png)
 
 
 <br>
 Everybody knows lots of diffent FPS shooter games, from Fortnite to CS:GO, the list is longly tiresome. So, what's any different about Vitrix? Well first of all, it has a really cool name. Second of all, it is open-source! No more sneaky malware in your closed-source applications, because the code of Vitrix is fully open and accessible to the community! Well? What are you waiting for? Go ahead and download it if you haven't already, and dive into a world of Vitrix fun!
 
+=======
 Frequently Asked Questions (FAQ): 
 
 Game Video/Screen Settings: 
@@ -80,3 +82,4 @@ A: Within the directory "Vitrix/vitrix/lib/UI/"
 
 <br>
 <h4>You can find out everything you else you need to know in the <a href="https://github.com/ShadityZ/Vitrix/blob/docs-development/docs/mainpage.md">Official Vitrix Documentation</a>!</h4>
+

requirements.txt

@@ -1,2 +1,3 @@
-git+https://github.com/ShadityZ/Vitrix-Engine.git@v1.0#egg=vitrix_engine
-venvctl==1.4.12
+git+https://github.com/ShadityZ/Vitrix-Engine.git#egg=vitrix_engine
+venvctl==1.4.12
+requests

server/blacklist.json

@@ -0,0 +1,3 @@
+{
+    "banned_users": []
+}

server/moderators.json

@@ -0,0 +1,3 @@
+{
+    "moderators": []
+}

server/properties

@@ -0,0 +1 @@
+10

server/server.py

@@ -1,23 +1,26 @@
 """
-Server version:     v1.0.0
+Server version:     v1.1.0
 """
 
-import os
-import sys
-import socket
-import json
-import time
-import random
-import threading
+"""
+"properties" file:
+line 1: MAX_PLAYERS
+"""
+
+import os,sys,socket,json,time,random,threading
+
+script_path = os.path.dirname(os.path.abspath(__file__))
+print(script_path)
 
 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
+properties = open(f"{script_path}/properties", 'r').read().split("\n")
+
+from vitrix.lib.api.anticheat import *
 
 ADDR = "0.0.0.0"
 PORT = 26822
-MAX_PLAYERS = 10
+MAX_PLAYERS = int(properties[0])
 MSG_SIZE = 2048
 
 
@@ -27,6 +30,34 @@
 
 
 players = {}
+kicked_users = []
+recently_banned_users = []
+
+
+def ban_user(user: str):
+    blacklist_file = open(f"{os.path.dirname(os.path.realpath(__file__))}/blacklist.json", "r")
+    blacklist = json.loads(blacklist_file.read())
+    blacklist["banned_users"].append(user)
+    with open("blacklist.json", "w") as file:
+        json.dump(blacklist, file)
+    recently_banned_users.append(user)
+
+
+def is_moderator(user: str):
+    moderators_file = open(f"{os.path.dirname(os.path.realpath(__file__))}/moderators.json", "r")
+    mods = json.loads(moderators_file.read())["moderators"]
+    if user in mods:
+        return True
+    else:
+        return False
+
+def is_banned(user: str):
+    blacklist_file = open(f"{os.path.dirname(os.path.realpath(__file__))}/blacklist.json", "r")
+    blacklist = json.loads(blacklist_file.read())["banned_users"]
+    if user in blacklist:
+        return True
+    else:
+        return False
 
 
 def generate_id(player_list: dict, max_players: int):
@@ -53,6 +84,13 @@ def handle_messages(identifier: str):
     username = client_info["username"]
 
     while True:
+        if username in recently_banned_users:
+            conn.send("banned".encode("utf8"))
+            break
+        if username in kicked_users:
+            conn.send("kicked".encode("utf8"))
+            break
+
         try:
             msg = conn.recv(MSG_SIZE)
         except ConnectionResetError:
@@ -76,13 +114,17 @@ def handle_messages(identifier: str):
             print(e)
             continue
 
-        print(f"Received message from player {username} with ID {identifier}")
-
         if msg_json["object"] == "player":
             players[identifier]["position"] = msg_json["position"]
             players[identifier]["rotation"] = msg_json["rotation"]
             players[identifier]["health"] = msg_json["health"]
 
+        if msg_json["object"] == "command":
+            if msg_json["type"] == "ban" and is_moderator(msg_json["author"]):
+                ban_user(msg_json["target"])
+            if msg_json["type"] == "kick" and is_moderator(msg_json["author"]):
+                kicked_users.append(msg_json["target"])
+
         for player_id in players:
             if player_id != identifier:
                 player_info = players[player_id]
@@ -103,6 +145,12 @@ def handle_messages(identifier: str):
 
     print(f"Player {username} with ID {identifier} has left the game...")
     del players[identifier]
+
+    if username in kicked_users:
+        kicked_users.remove(username)
+    if username in recently_banned_users:
+        recently_banned_users.remove(username)
+
     conn.close()
 
 
@@ -114,52 +162,54 @@ 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": 150}
-
-
-        for player_id in players:
-            if player_id != new_id:
-                player_info = players[player_id]
-                player_conn: socket.socket = player_info["socket"]
-                try:
-                    player_conn.send(json.dumps({
-                        "id": new_id,
-                        "object": "player",
-                        "username": new_player_info["username"],
-                        "position": new_player_info["position"],
-                        "health": new_player_info["health"],
-                        "joined": True,
-                        "left": False
-                    }).encode("utf8"))
-                except OSError:
-                    pass
-
-        for player_id in players:
-            if player_id != new_id:
-                player_info = players[player_id]
-                try:
-                    conn.send(json.dumps({
-                        "id": player_id,
-                        "object": "player",
-                        "username": player_info["username"],
-                        "position": player_info["position"],
-                        "health": player_info["health"],
-                        "joined": True,
-                        "left": False
-                    }).encode("utf8"))
-                    time.sleep(0.1)
-                except OSError:
-                    pass
-
-        players[new_id] = new_player_info
-
-        msg_thread = threading.Thread(target=handle_messages, args=(new_id,), daemon=True)
-        msg_thread.start()
-
-        print(f"New connection from {addr}, assigned ID: {new_id}...")
+        if is_banned(username):
+            conn.send("False".encode("utf8"))
+        else:
+            conn.send("True".encode("utf8"))
+            new_player_info = {"socket": conn, "username": username, "position": (0, 1, 0), "rotation": 0, "health": 150}
+
+
+            for player_id in players:
+                if player_id != new_id:
+                    player_info = players[player_id]
+                    player_conn: socket.socket = player_info["socket"]
+                    try:
+                        player_conn.send(json.dumps({
+                            "id": new_id,
+                            "object": "player",
+                            "username": new_player_info["username"],
+                            "position": new_player_info["position"],
+                            "health": new_player_info["health"],
+                            "joined": True,
+                            "left": False
+                        }).encode("utf8"))
+                    except OSError:
+                        pass
+
+            for player_id in players:
+                if player_id != new_id:
+                    player_info = players[player_id]
+                    try:
+                        conn.send(json.dumps({
+                            "id": player_id,
+                            "object": "player",
+                            "username": player_info["username"],
+                            "position": player_info["position"],
+                            "health": player_info["health"],
+                            "joined": True,
+                            "left": False
+                        }).encode("utf8"))
+                        time.sleep(0.1)
+                    except OSError:
+                        pass
+
+            players[new_id] = new_player_info
+
+            msg_thread = threading.Thread(target=handle_messages, args=(new_id,), daemon=True)
+            msg_thread.start()
+
+            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__":

vitrix/lib/UI/chat.py

@@ -1,5 +1,5 @@
 from vitrix_engine import *
-from lib.classes.network import Network
+from lib.api.network import Network
 
 class Chat(Entity):
     def __init__(self, network: Network, username: str, **kwargs):
@@ -40,9 +40,15 @@ def update(self):
     def input(self, key):
         if key == "enter":
             #temp = self.prefix + self.text_field.text
-            self.network.send_message(self.prefix + self.text_field.text)
-            self.list.append(self.prefix + self.text_field.text)
-            self.text_field.text = ""
+            if not self.text_field.text[0] == "/": # if message is not a command
+                self.network.send_message(self.prefix + self.text_field.text)
+                self.list.append(self.prefix + self.text_field.text)
+                self.text_field.text = ""
+            else:
+                type = self.text_field.text[1:].split()[0] # get command (ex: ban)
+                user = self.text_field.text[1:].split()[1] # get user (ex: RandomUser1234)
+                self.text_field.text = ""
+                self.network.send_command(type, user)
 
     def enable(self):
         self.enabled = True

vitrix/lib/UI/crosshair.py

@@ -1,5 +1,5 @@
 from vitrix_engine import *
-from lib.paths import GamePaths
+from lib.data import GamePaths
 
 
 class Crosshair(Entity):
@@ -9,7 +9,7 @@ def __init__(self):
             model=os.path.join(GamePaths.models_dir, "cube.obj"),
             scale=.07
         )
-
+        self.shader = None
         self.set_ranged()
 
     def set_ranged(self):

vitrix/lib/UI/healthbar.py

@@ -1,7 +1,5 @@
-import math
-from turtle import position
 from vitrix_engine import *
-from lib.paths import GamePaths
+from lib.data import GamePaths
 
 
 class HealthBar(Entity):