code refactoring

This commit is contained in:
Ayush Saini 2023-08-15 21:59:54 +05:30
parent 665f15fa6d
commit 1c4fda9a8d
24 changed files with 23236 additions and 23206 deletions

View file

@ -5,9 +5,9 @@ from datetime import datetime
import _babase
import setting
from playersData import pdata
from serverData import serverdata
from playersdata import pdata
from serverdata import serverdata
from .commands import normal_commands , management, fun , cheats
import bascenev1 as bs
from .handlers import check_permissions
from .handlers import clientid_to_accountid
@ -25,16 +25,16 @@ def command_type(command):
Returns:
any
"""
if command in NormalCommands.Commands or command in NormalCommands.CommandAliases:
if command in normal_commands.Commands or command in normal_commands.CommandAliases:
return "Normal"
if command in Management.Commands or command in Management.CommandAliases:
if command in management.Commands or command in management.CommandAliases:
return "Manage"
if command in Fun.Commands or command in Fun.CommandAliases:
if command in fun.Commands or command in fun.CommandAliases:
return "Fun"
if command in Cheats.Commands or command in Cheats.CommandAliases:
if command in cheats.Commands or command in cheats.CommandAliases:
return "Cheats"
@ -55,11 +55,11 @@ def execute(msg, clientid):
print("checking command type")
print(command_type(command))
if command_type(command) == "Normal":
NormalCommands.ExcelCommand(command, arguments, clientid, accountid)
normal_commands.ExcelCommand(command, arguments, clientid, accountid)
elif command_type(command) == "Manage":
if check_permissions(accountid, command):
Management.ExcelCommand(command, arguments, clientid, accountid)
management.ExcelCommand(command, arguments, clientid, accountid)
bs.broadcastmessage("Executed", transient=True, clients=[clientid])
else:
bs.broadcastmessage("access denied", transient=True,
@ -67,7 +67,7 @@ def execute(msg, clientid):
elif command_type(command) == "Fun":
if check_permissions(accountid, command):
Fun.ExcelCommand(command, arguments, clientid, accountid)
fun.ExcelCommand(command, arguments, clientid, accountid)
bs.broadcastmessage("Executed", transient=True, clients=[clientid])
else:
bs.broadcastmessage("access denied", transient=True,
@ -75,7 +75,7 @@ def execute(msg, clientid):
elif command_type(command) == "Cheats":
if check_permissions(accountid, command):
Cheats.ExcelCommand(command, arguments, clientid, accountid)
cheats.ExcelCommand(command, arguments, clientid, accountid)
bs.broadcastmessage("Executed", transient=True, clients=[clientid])
else:
bs.broadcastmessage("access denied", transient=True,

View file

@ -3,9 +3,9 @@ import random
import _babase
import _bascenev1
import setting
from playersData import pdata
from playersdata import pdata
# from tools.whitelist import add_to_white_list, add_commit_to_logs
from serverData import serverdata
from serverdata import serverdata
import babase
import bascenev1 as bs

View file

@ -1,6 +1,6 @@
# Released under the MIT License. See LICENSE for details.
from playersData import pdata
from playersdata import pdata
import bascenev1 as bs

View file

@ -4,8 +4,8 @@ import time
import setting
from features import profanity
from playersData import pdata
from serverData import serverdata
from playersdata import pdata
from serverdata import serverdata
import bascenev1 as bs
from tools import logger

View file

@ -3,11 +3,11 @@
from datetime import datetime
import setting
from chatHandle.chatFilter import ChatFilter
from chatHandle.chatcommands import executor
from chathandle.chatfilter import chatfilter
from chathandle.chatcommands import command_executor
from features import votingmachine
from playersData import pdata
from serverData import serverdata
from playersdata import pdata
from serverdata import serverdata
import bascenev1 as bs
from tools import logger, servercheck
@ -19,8 +19,7 @@ def filter_chat_message(msg, client_id):
now = datetime.now()
if client_id == -1:
if msg.startswith("/"):
print("message stars with /")
executor.execute(msg, client_id)
command_executor.execute(msg, client_id)
return None
logger.log(f"Host msg: | {msg}", "chat")
return msg
@ -37,12 +36,12 @@ def filter_chat_message(msg, client_id):
currentname = "<in-lobby>"
displaystring = i['display_string']
if acid:
msg = ChatFilter.filter(msg, acid, client_id)
msg = chatfilter.filter(msg, acid, client_id)
if msg == None:
return
logger.log(f'{acid} | {displaystring}| {currentname} | {msg}', "chat")
if msg.startswith("/"):
msg = executor.execute(msg, client_id)
msg = command_executor.execute(msg, client_id)
if msg == None:
return
@ -72,9 +71,9 @@ def filter_chat_message(msg, client_id):
return None
else:
if msg.startswith(",") and settings["allowTeamChat"]:
return executor.QuickAccess(msg, client_id)
return command_executor.QuickAccess(msg, client_id)
if msg.startswith(".") and settings["allowInGameChat"]:
return executor.QuickAccess(msg, client_id)
return command_executor.QuickAccess(msg, client_id)
return msg
else:

View file

@ -64,7 +64,7 @@ class modSetup(babase.Plugin):
bootstraping()
servercheck.checkserver().start()
ServerUpdate.check()
bs.AppTimer(5, account.updateOwnerIps)
bs.apptimer(5, account.updateOwnerIps)
if settings["afk_remover"]['enable']:
afk_check.checkIdle().start()
if (settings["useV2Account"]):
@ -302,8 +302,11 @@ def night_mode() -> None:
activity.globalsnode.tint = (0.5, 0.7, 1.0)
if settings['autoNightMode']['fireflies']:
activity.fireflies_generator(
20, settings['autoNightMode']["fireflies_random_color"])
try:
activity.fireflies_generator(
20, settings['autoNightMode']["fireflies_random_color"])
except:
pass
def kick_vote_started(started_by: str, started_to: str) -> None:
@ -398,7 +401,6 @@ def wrap_player_spaz_init(original_class):
character = args[3] if len(
args) > 3 else kwargs.get('character', 'Spaz')
print(f"Player: {player}, Character: {character}")
# Modify the character value
modified_character = modifyspaz.getCharacter(player, character)
if len(args) > 3:

View file

@ -9,6 +9,7 @@ on_begin_original = bs._activity.Activity.on_begin
def fireflies_generator(activity, count, random_color: False):
if random_color:
color = (random.uniform(0, 1.2), random.uniform(
0, 1.2), random.uniform(0, 1.2))

View file

@ -1,20 +1,23 @@
import bascenev1 as bs
from features import fire_flies,hearts
import babase
def decorate_map():
try:
activity = bs.get_foreground_host_activity()
activity.fireflies_generator(20, True)
activity.hearts_generator()
activity.map.node.reflection = "powerup"
activity.map.node.reflection_scale = [4]
activity.globalsnode.tint = (0.5, 0.7, 1)
activity.map.node.reflection_scale = [3]
activity.globalsnode.tint = (0.4, 0.7, 1)
# activity.map.node.color = random.choices([(0.8,0.3,0.3),(0.6,0.5,0.7),(0.3,0.8,0.5)])[0]
m = 5
s = 5000
bs.animate_array(activity.globalsnode, 'ambient_color', 3, {0: (
1 * m, 0, 0), s: (0, 1 * m, 0), s * 2: (0, 0, 1 * m),
s * 3: (1 * m, 0, 0)}, True)
activity.map.background.reflection = "soft"
# activity.map.background.reflection = "soft"
except:
pass

View file

@ -1,5 +1,5 @@
import setting
from serverData import serverdata
from serverdata import serverdata
import bascenev1 as bs
from bascenev1._coopsession import CoopSession

View file

@ -1,17 +1,17 @@
{
"customeffects": {
"pb-IF4TVWwZUQ==": [
"spark"
],
"pb-smoothy-effect": [
"spark"
],
"pb-testingroles": [
"highlightshine"
]
},
"customtag": {
"pb-id5y54y54": "smoothy",
"pb-smoothybro": "they smoothy"
}
"customeffects": {
"pb-IF4TVWwZUQ==": [
"spark"
],
"pb-smoothy-effect": [
"spark"
],
"pb-testingroles": [
"highlightshine"
]
},
"customtag": {
"pb-id5y54y54": "smoothy",
"pb-smoothybro": "they smoothy"
}
}

View file

@ -16,7 +16,7 @@ from datetime import datetime, timedelta
import _bascenev1
import setting
from serverData import serverdata
from serverdata import serverdata
from tools.ServerUpdate import checkSpammer
from tools.file_handle import OpenJson
from typing import TYPE_CHECKING

File diff suppressed because one or more lines are too long

View file

@ -22982,11 +22982,11 @@
"lastSpam": 1692041275.3951833,
"totaltimeplayer": 0,
"warnCount": 0,
"lastWarned": 1692092826.0631683,
"lastWarned": 1692116320.3350005,
"verified": true,
"rejoincount": 1,
"lastJoin": 1692092826.063172,
"lastIP": "axj~}j~~jhai",
"lastJoin": 1692116320.3350034,
"lastIP": "axj~|h~}hhai",
"deviceUUID": "26f30cfd3921c2d15574b534cb824c952b14f189",
"cMsgCount": 0,
"lastMsgTime": 1692092832.8181152,

View file

@ -1,92 +1,93 @@
{
"owner": {
"tag": "\\cowner\\c",
"tagcolor": [
1,
0.6,
0.4
],
"commands": [
"ALL"
],
"ids": [
"pb-IF48VWkBFQ",
"pb-JiNJARBaXEFBVF9HFkNXXF1EF0ZaRlZE",
"pb-IF4TVWwZUQ==",
"pb-IF4SVW9dEg==",
"pb-IF5XUm9eAg=="
]
},
"admin": {
"tag": "\ue043admin\ue043",
"tagcolor": [
1,
1,
1
],
"commands": [
"createrole"
],
"ids": [
"pb-IF4TVWwZUQ=="
]
},
"vip": {
"tag": "vip",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": []
},
"smoothy": {
"tag": "smoothy",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": []
},
"pros": {
"tag": "pros",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": []
},
"top5": {
"tag": "top5",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": [
"pb-IF4VAk4a"
]
},
"bypass-warn": {
"tag": "",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": [
"pb-IF5XUm9eAg==",
"pb-IF43VUwlAg==",
"pb-IF4iVUc5Cg==",
"pb-IF4vNnMJ",
"pb-IF4TVWwZUQ=="
]
}
"owner": {
"tag": "\\cowner\\c",
"tagcolor": [
1,
0.6,
0.4
],
"commands": [
"ALL"
],
"ids": [
"pb-IF48VWkBFQ",
"pb-JiNJARBaXEFBVF9HFkNXXF1EF0ZaRlZE",
"pb-IF4TVWwZUQ==",
"pb-IF4SVW9dEg==",
"pb-IF5XUm9eAg=="
]
},
"admin": {
"tag": "\ue043admin\ue043",
"tagcolor": [
1,
1,
1
],
"commands": [
"createrole"
],
"ids": [
"pb-IF4TVWwZUQ=="
]
},
"vip": {
"tag": "vip",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": []
},
"smoothy": {
"tag": "smoothy",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": []
},
"pros": {
"tag": "pros",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": []
},
"top5": {
"tag": "top5",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": [
"pb-IF4VAk4a",
"pb-IF5RU3EcAg=="
]
},
"bypass-warn": {
"tag": "",
"tagcolor": [
1,
1,
1
],
"commands": [],
"ids": [
"pb-IF5XUm9eAg==",
"pb-IF43VUwlAg==",
"pb-IF4iVUc5Cg==",
"pb-IF4vNnMJ",
"pb-IF4TVWwZUQ=="
]
}
}

View file

@ -70,7 +70,8 @@
],
"commands": [],
"ids": [
"pb-IF4VAk4a"
"pb-IF4VAk4a",
"pb-IF5RU3EcAg=="
]
},
"bypass-warn": {

View file

@ -1,31 +1,31 @@
{
"pb-IF41U2scIg==": {
"subscribers": [
"jrz6Rg"
]
},
"pb-IF4IVFkKNA==": {
"subscribers": [
"jrz6Rg"
],
"name": "\ue063ATTITUDEB2"
},
"pb-IF4CKhYn": {
"subscribers": [
"jrz6Rg"
],
"name": "\ue032Rico Un\u2122\u00a9\u00ae"
},
"pb-IF4jF1NY": {
"subscribers": [
"jrz6Rg"
],
"name": "\ue01eHoemaster"
},
"pb-IF4wVVk8Jg==": {
"subscribers": [
"jrz6Rg"
],
"name": "\ue063Homulilly"
}
"pb-IF41U2scIg==": {
"subscribers": [
"jrz6Rg"
]
},
"pb-IF4IVFkKNA==": {
"subscribers": [
"jrz6Rg"
],
"name": "\ue063ATTITUDEB2"
},
"pb-IF4CKhYn": {
"subscribers": [
"jrz6Rg"
],
"name": "\ue032Rico Un\u2122\u00a9\u00ae"
},
"pb-IF4jF1NY": {
"subscribers": [
"jrz6Rg"
],
"name": "\ue01eHoemaster"
},
"pb-IF4wVVk8Jg==": {
"subscribers": [
"jrz6Rg"
],
"name": "\ue063Homulilly"
}
}

View file

@ -1,10 +1,10 @@
{
"jrz6Rg": {
"endpoint": "https://wns2-pn1p.notify.windows.com/w/?token=BQYAAAACsvYS2nXaGg2g2jLcjLjp4bwznS9iOrr3BCN%2bvTCn%2fHqOyzKJSI3IqeLRM0klolKhnswEn0YOYDgvEnAW0bJRJsSW8nmg0y8RZoY5%2bGnVGqv8VXoGafhDTJOb5%2bKfgRRz01qtOW2qQogWRj3dRsVw%2fEw6dliZOl3SC3eBfgOg5dIkiIFSvl%2bVDnbCzW%2bESVJe9aYuffk%2b1XvvTtcxpoUzQMvcoa7fXhrcJtb%2foZWLGj3sWOrGA3D1gnMuuoSnRqH8qsHTqP2BkFiXm2E860qxocYKDVWNZkkbWGw1PwNsZe3U9qO1fyDkmWpdljZf7hFZ9eS9bauneNBqKw7H6IGl",
"expirationTime": null,
"keys": {
"p256dh": "BOG4r91J0rFq8YveeCMv4E9zAIOpqyAadsqAQ0R0yWSKVCUE06gMGB52ofsCNEhtBH3_lYs9Uf0ecT-iVGFeziA",
"auth": "yNEWaUfEYLWZlyBNdZIDrg"
"jrz6Rg": {
"endpoint": "https://wns2-pn1p.notify.windows.com/w/?token=BQYAAAACsvYS2nXaGg2g2jLcjLjp4bwznS9iOrr3BCN%2bvTCn%2fHqOyzKJSI3IqeLRM0klolKhnswEn0YOYDgvEnAW0bJRJsSW8nmg0y8RZoY5%2bGnVGqv8VXoGafhDTJOb5%2bKfgRRz01qtOW2qQogWRj3dRsVw%2fEw6dliZOl3SC3eBfgOg5dIkiIFSvl%2bVDnbCzW%2bESVJe9aYuffk%2b1XvvTtcxpoUzQMvcoa7fXhrcJtb%2foZWLGj3sWOrGA3D1gnMuuoSnRqH8qsHTqP2BkFiXm2E860qxocYKDVWNZkkbWGw1PwNsZe3U9qO1fyDkmWpdljZf7hFZ9eS9bauneNBqKw7H6IGl",
"expirationTime": null,
"keys": {
"p256dh": "BOG4r91J0rFq8YveeCMv4E9zAIOpqyAadsqAQ0R0yWSKVCUE06gMGB52ofsCNEhtBH3_lYs9Uf0ecT-iVGFeziA",
"auth": "yNEWaUfEYLWZlyBNdZIDrg"
}
}
}
}

View file

@ -2,7 +2,7 @@ import functools
import random
import setting
from playersData import pdata
from playersdata import pdata
from stats import mystats
from typing import Sequence

View file

@ -1,5 +1,5 @@
import setting
from playersData import pdata
from playersdata import pdata
from stats import mystats
import babase

View file

@ -168,7 +168,7 @@ def refreshStats():
dump_stats(pStats)
updateTop3Names(toppersIDs[0:3])
from playersData import pdata
from playersdata import pdata
pdata.update_toppers(toppersIDs)

View file

@ -1,18 +1,31 @@
{
"startDate": "06-08-2023",
"stats": {
"pb-IF4VAk4a": {
"rank": 1,
"name": "pb-IF4VAk4a",
"scores": 0,
"total_damage": 0.0,
"kills": 0,
"deaths": 0,
"games": 18,
"kd": 0.0,
"avg_score": 0.0,
"aid": "pb-IF4VAk4a",
"last_seen": "2022-04-26 17:01:13.715014"
"startDate": "06-08-2023",
"stats": {
"pb-IF4VAk4a": {
"rank": 1,
"name": "pb-IF4VAk4a",
"scores": 0,
"total_damage": 0.0,
"kills": 0,
"deaths": 0,
"games": 18,
"kd": 0.0,
"avg_score": 0.0,
"aid": "pb-IF4VAk4a",
"last_seen": "2022-04-26 17:01:13.715014"
},
"pb-IF5RU3EcAg==": {
"rank": 2,
"name": "PC593100",
"scores": 20,
"total_damage": 0.0,
"kills": 0,
"deaths": 2,
"games": 6,
"kd": 0.0,
"avg_score": 3.333,
"last_seen": "2023-08-15 21:53:45.049564",
"aid": "pb-IF5RU3EcAg=="
}
}
}
}

View file

@ -13,6 +13,19 @@
"avg_score": 0.0,
"aid": "pb-IF4VAk4a",
"last_seen": "2022-04-26 17:01:13.715014"
},
"pb-IF5RU3EcAg==": {
"rank": 2,
"name": "PC593100",
"scores": 20,
"total_damage": 0.0,
"kills": 0,
"deaths": 2,
"games": 6,
"kd": 0.0,
"avg_score": 4.0,
"last_seen": "2023-08-15 21:53:45.049564",
"aid": "pb-IF5RU3EcAg=="
}
}
}

View file

@ -4,7 +4,7 @@ import time
import urllib.request
import requests
from playersData import pdata
from playersdata import pdata
import babase
import bascenev1
@ -14,14 +14,13 @@ VERSION = 71
def check():
print("hey")
print(babase.app.classic)
print(babase.app.classic.server)
_thread.start_new_thread(updateProfilesJson, ())
_thread.start_new_thread(checkChangelog, ())
bascenev1.AppTimer(5, postStatus)
bascenev1.apptimer(15, postStatus)
def updateProfilesJson():
@ -36,7 +35,6 @@ def updateProfilesJson():
def postStatus():
print("post status clled finally")
link = 'https://bcsservers.ballistica.workers.dev/ping'
data = {'name': babase.app.classic.server._config.party_name,
'port': str(bascenev1.get_game_port()),
@ -46,7 +44,6 @@ def postStatus():
def postRequest(link, data):
print(data)
try:
res = requests.post(link,
json=data)

View file

@ -12,8 +12,8 @@ import _babase
import _bascenev1
import setting
from features import profanity
from playersData import pdata
from serverData import serverdata
from playersdata import pdata
from serverdata import serverdata
import babase
import bascenev1 as bs