mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Add automated forge server creation installs
This commit is contained in:
Andrew
parent
cd93b468b3
commit
ad4603aafb
@ -119,9 +119,15 @@ class ServersController(metaclass=Singleton):
|
||||
return srv.stats_helper.set_import()
|
||||
|
||||
@staticmethod
|
||||
def finish_import(server_id):
|
||||
def finish_import(server_id, forge=False):
|
||||
srv = ServersController().get_server_instance_by_id(server_id)
|
||||
return srv.stats_helper.finish_import()
|
||||
srv.stats_helper.finish_import()
|
||||
# This is where we start the forge installerr
|
||||
if forge:
|
||||
srv.run_threaded_server(
|
||||
HelperUsers.get_user_id_by_name("system"), forge_install=True
|
||||
)
|
||||
return
|
||||
|
||||
@staticmethod
|
||||
def get_import_status(server_id):
|
||||
|
||||
@ -187,31 +187,28 @@ class ServerJars:
|
||||
|
||||
# open a file stream
|
||||
with requests.get(fetch_url, timeout=2, stream=True) as r:
|
||||
success = False
|
||||
try:
|
||||
with open(path, "wb") as output:
|
||||
shutil.copyfileobj(r.raw, output)
|
||||
ServersController.finish_import(server_id)
|
||||
# If this is the newer forge version we will run the installer
|
||||
if server == "forge" and int(version.split(".")[1]) > 15:
|
||||
ServersController.finish_import(server_id, True)
|
||||
else:
|
||||
ServersController.finish_import(server_id)
|
||||
|
||||
for user in server_users:
|
||||
self.helper.websocket_helper.broadcast_user(
|
||||
user, "notification", "Executable download finished"
|
||||
)
|
||||
time.sleep(3)
|
||||
self.helper.websocket_helper.broadcast_user(
|
||||
user, "send_start_reload", {}
|
||||
)
|
||||
return True
|
||||
success = True
|
||||
except Exception as e:
|
||||
logger.error(f"Unable to save jar to {path} due to error:{e}")
|
||||
ServersController.finish_import(server_id)
|
||||
server_users = PermissionsServers.get_server_user_list(server_id)
|
||||
for user in server_users:
|
||||
self.helper.websocket_helper.broadcast_user(
|
||||
user, "notification", "Executable download finished"
|
||||
)
|
||||
time.sleep(3)
|
||||
self.helper.websocket_helper.broadcast_user(
|
||||
user, "send_start_reload", {}
|
||||
)
|
||||
|
||||
return False
|
||||
for user in server_users:
|
||||
self.helper.websocket_helper.broadcast_user(
|
||||
user, "notification", "Executable download finished"
|
||||
)
|
||||
time.sleep(3)
|
||||
self.helper.websocket_helper.broadcast_user(
|
||||
user, "send_start_reload", {}
|
||||
)
|
||||
return success
|
||||
|
||||
@ -484,17 +484,32 @@ class Controller:
|
||||
return False
|
||||
|
||||
if Helpers.is_os_windows():
|
||||
server_command = (
|
||||
f"java -Xms{Helpers.float_to_string(min_mem)}M "
|
||||
f"-Xmx{Helpers.float_to_string(max_mem)}M "
|
||||
f'-jar "{server_file}" nogui'
|
||||
)
|
||||
# Let's check for and setup for install server commands
|
||||
if server == "forge":
|
||||
server_command = (
|
||||
f"java -Xms{Helpers.float_to_string(min_mem)}M "
|
||||
f"-Xmx{Helpers.float_to_string(max_mem)}M "
|
||||
f'-jar "{server_file}" --installServer'
|
||||
)
|
||||
else:
|
||||
server_command = (
|
||||
f"java -Xms{Helpers.float_to_string(min_mem)}M "
|
||||
f"-Xmx{Helpers.float_to_string(max_mem)}M "
|
||||
f'-jar "{server_file}" nogui'
|
||||
)
|
||||
else:
|
||||
server_command = (
|
||||
f"java -Xms{Helpers.float_to_string(min_mem)}M "
|
||||
f"-Xmx{Helpers.float_to_string(max_mem)}M "
|
||||
f"-jar {server_file} nogui"
|
||||
)
|
||||
if server == "forge":
|
||||
server_command = (
|
||||
f"java -Xms{Helpers.float_to_string(min_mem)}M "
|
||||
f"-Xmx{Helpers.float_to_string(max_mem)}M "
|
||||
f"-jar {server_file} --installServer"
|
||||
)
|
||||
else:
|
||||
server_command = (
|
||||
f"java -Xms{Helpers.float_to_string(min_mem)}M "
|
||||
f"-Xmx{Helpers.float_to_string(max_mem)}M "
|
||||
f"-jar {server_file} nogui"
|
||||
)
|
||||
server_log_file = "./logs/latest.log"
|
||||
server_stop = "stop"
|
||||
|
||||
|
||||
@ -202,12 +202,15 @@ class ServerInstance:
|
||||
# remove the scheduled job since it's ran
|
||||
return self.server_scheduler.remove_job(str(self.server_id))
|
||||
|
||||
def run_threaded_server(self, user_id):
|
||||
def run_threaded_server(self, user_id, forge_install=False):
|
||||
# start the server
|
||||
self.server_thread = threading.Thread(
|
||||
target=self.start_server,
|
||||
daemon=True,
|
||||
args=(user_id,),
|
||||
args=(
|
||||
user_id,
|
||||
forge_install,
|
||||
),
|
||||
name=f"{self.server_id}_server_thread",
|
||||
)
|
||||
self.server_thread.start()
|
||||
@ -292,7 +295,7 @@ class ServerInstance:
|
||||
logger.critical(f"Unable to write/access {self.server_path}")
|
||||
Console.critical(f"Unable to write/access {self.server_path}")
|
||||
|
||||
def start_server(self, user_id):
|
||||
def start_server(self, user_id, forge_install=False):
|
||||
if not user_id:
|
||||
user_lang = self.helper.get_setting("language")
|
||||
else:
|
||||
@ -341,7 +344,9 @@ class ServerInstance:
|
||||
"eula= true",
|
||||
"eula =true",
|
||||
]
|
||||
|
||||
# If this is a forge installer we're running we can bypass the eula checks.
|
||||
if forge_install is True:
|
||||
e_flag = True
|
||||
if not e_flag and self.settings["type"] == "minecraft-java":
|
||||
if user_id:
|
||||
self.helper.websocket_helper.broadcast_user(
|
||||
@ -540,6 +545,10 @@ class ServerInstance:
|
||||
self.detect_crash, "interval", seconds=30, id=f"c_{self.server_id}"
|
||||
)
|
||||
|
||||
# If this is a forge install we'll call the watcher to do the things
|
||||
if forge_install:
|
||||
self.forge_install_watcher()
|
||||
|
||||
def check_internet_thread(self, user_id, user_lang):
|
||||
if user_id:
|
||||
if not Helpers.check_internet():
|
||||
@ -553,6 +562,50 @@ class ServerInstance:
|
||||
},
|
||||
)
|
||||
|
||||
def forge_install_watcher(self):
|
||||
# Enter for install if that parameter is true
|
||||
while True:
|
||||
# We'll watch the process
|
||||
if self.process.poll() is None:
|
||||
# IF process still has not exited we'll keep looping
|
||||
time.sleep(5)
|
||||
Console.debug("Installing Forge...")
|
||||
else:
|
||||
# Process has exited. Lets do some work to setup the new
|
||||
# run command.
|
||||
# We need to grab the exact forge version number.
|
||||
# We know we can find it here.
|
||||
version = os.listdir(
|
||||
os.path.join(self.server_path, "libraries/net/minecraftforge/forge")
|
||||
)[0]
|
||||
# Let's grab the server object we're going to update.
|
||||
server_obj = HelperServers.get_server_obj(self.server_id)
|
||||
# The forge install is done so we can delete that install file.
|
||||
os.remove(os.path.join(server_obj.path, server_obj.executable))
|
||||
# Let's set the proper server executable
|
||||
server_obj.executable = os.path.join(
|
||||
"libraries/net/minecraftforge/forge/"
|
||||
f"{version}/forge-{version}-server.jar"
|
||||
)
|
||||
# Now lets set up the new run command.
|
||||
# This is based off the run.sh/bat that
|
||||
# Forge uses in 1.16 and <
|
||||
if self.helper.is_os_windows():
|
||||
server_obj.execution_command = (
|
||||
"java @user_jvm_args.txt @libraries/net/"
|
||||
f"minecraftforge/forge/{version}/win_args.txt nogui"
|
||||
)
|
||||
else:
|
||||
server_obj.execution_command = (
|
||||
"java @user_jvm_args.txt @libraries/net/"
|
||||
f"minecraftforge/forge/{version}/unix_args.txt nogui"
|
||||
)
|
||||
Console.debug("SUCCESS! Forge install completed")
|
||||
|
||||
# We'll update the server with the new information now.
|
||||
HelperServers.update_server(server_obj)
|
||||
break
|
||||
|
||||
def stop_crash_detection(self):
|
||||
# This is only used if the crash detection settings change
|
||||
# while the server is running.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user