bump to v24.07.29 before releasing v1.2

ngdplnk · Jul 30, 2024 · 3435f43 · 3435f43
1 parent daf050e
commit 3435f43
Show file tree

Hide file tree

Showing 10 changed files with 1,943 additions and 648 deletions.
diff --git a/1-release/main.py b/1-release/main.py
diff --git a/2-development/dev.py b/2-development/dev.py
diff --git a/3-launcher/base.py b/3-launcher/base.py
diff --git a/3-launcher/build.nsi b/3-launcher/build.nsi
@@ -5,13 +5,13 @@
 
 ############################################################
 
-Caption "SSTools4MC v1.1 Installer"
+Caption "SSTools4MC v1.2 Installer"
 UninstallCaption "SSTools4MC Uninstaller"
-!define APP_VERSION "1.1"
-!define PRODUCT_VERSION "1.1.0.0"
-!define APP_EDITOR "TLSoftware"
+!define APP_VERSION "1.2"
+!define PRODUCT_VERSION "1.2.0.0"
+!define APP_EDITOR "ngdplnk"
 
-Outfile "SSTools4MC_Setup_v1.1.exe"
+Outfile "SSTools4MC_Setup_v1.2.exe"
 SetCompressor /SOLID lzma
 Icon "${ICON_PATH}"
 
@@ -20,39 +20,39 @@ SilentUninstall silent
 
 VIProductVersion "${PRODUCT_VERSION}"
 VIAddVersionKey "ProductName" "SSTools4MC Launcher"
-VIAddVersionKey "CompanyName" "TLSoftware"
+VIAddVersionKey "CompanyName" "ngdplnk"
 VIAddVersionKey "FileDescription" "SSTools4MC Launcher"
 VIAddVersionKey "FileVersion" "${APP_VERSION}"
-VIAddVersionKey "LegalCopyright" "Copyright (C) 2024 TLSoftware"
+VIAddVersionKey "LegalCopyright" "Copyright (C) 2024 ngdplnk"
 VIAddVersionKey "OriginalFilename" "SSTools4MC_Launcher.exe"
 VIAddVersionKey "Comments" "Created by ${APP_EDITOR}"
 
 # Define the installation directory
-InstallDir $APPDATA\TLSoftware\SSTools4MC
+InstallDir $APPDATA\SSTools4MC
 
 Section "MainSection" SEC01
 
   # Set the installer to close automatically when done
   SetAutoClose true
 
   # Define the directory for the program
-  SetOutPath $APPDATA\TLSoftware\SSTools4MC
+  SetOutPath $APPDATA\SSTools4MC
 
   # Copy files
   File /oname=launcher.pyw "${LAUNCHER_PATH}"
   File /oname=main.py "${BASE_PATH}"
 
   # Define the directory for the icon
-  SetOutPath $APPDATA\TLSoftware\SSTools4MC\assets
+  SetOutPath $APPDATA\SSTools4MC\assets
 
   # Copy the file
   File /oname=icon.ico "${ICON_PATH}"
 
   # Create a desktop shortcut
-  CreateShortCut "$DESKTOP\SSTools4MC Launcher.lnk" "$APPDATA\TLSoftware\SSTools4MC\launcher.pyw" "" "$APPDATA\TLSoftware\SSTools4MC\assets\icon.ico" 0
+  CreateShortCut "$DESKTOP\SSTools4MC Launcher.lnk" "$APPDATA\SSTools4MC\launcher.pyw" "" "$APPDATA\SSTools4MC\assets\icon.ico" 0
 
   # Create a Start Menu shortcut
-  CreateShortCut "$SMPROGRAMS\SSTools4MC Launcher.lnk" "$APPDATA\TLSoftware\SSTools4MC\launcher.pyw" "" "$APPDATA\TLSoftware\SSTools4MC\assets\icon.ico" 0
+  CreateShortCut "$SMPROGRAMS\SSTools4MC Launcher.lnk" "$APPDATA\SSTools4MC\launcher.pyw" "" "$APPDATA\SSTools4MC\assets\icon.ico" 0
 
   # Write the uninstall keys for Add/Remove Programs
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\SSTools4MC" "DisplayName" "SSTools4MC Launcher"
@@ -70,7 +70,7 @@ Section "MainSection" SEC01
 
   runProgram:
   # Run the program if the user clicked "Yes"
-  ExecShell "" "$APPDATA\TLSoftware\SSTools4MC\launcher.pyw"
+  ExecShell "" "$APPDATA\SSTools4MC\launcher.pyw"
 
   end:
 
@@ -82,9 +82,9 @@ Section "Uninstall"
   SetAutoClose true
 
   # Remove the files
-  Delete $APPDATA\TLSoftware\SSTools4MC\launcher.pyw
-  Delete $APPDATA\TLSoftware\SSTools4MC\main.py
-  Delete $APPDATA\TLSoftware\SSTools4MC\assets\icon.ico
+  Delete $APPDATA\SSTools4MC\launcher.pyw
+  Delete $APPDATA\SSTools4MC\main.py
+  Delete $APPDATA\SSTools4MC\assets\icon.ico
 
   # Remove the shortcuts
   Delete "$DESKTOP\SSTools4MC Launcher.lnk"
@@ -97,8 +97,8 @@ Section "Uninstall"
   DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\SSTools4MC"
 
   # Remove the directories
-  RMDir /r $APPDATA\TLSoftware\SSTools4MC\assets
-  RMDir /r $APPDATA\TLSoftware\SSTools4MC
+  RMDir /r $APPDATA\SSTools4MC\assets
+  RMDir /r $APPDATA\SSTools4MC
 
   # Show a message when the program is completely uninstalled
   MessageBox MB_OK|MB_ICONINFORMATION "SSTools4MC has been completely uninstalled."

diff --git a/3-launcher/icon.ico b/3-launcher/icon.ico
diff --git a/3-launcher/icon.png b/3-launcher/icon.png
diff --git a/3-launcher/launcher.pyw b/3-launcher/launcher.pyw
@@ -1,13 +1,13 @@
-### SSTools4MC Launcher ###
-###########################
+#### SSTools4MC Launcher  ####
+#### DEVELOPED BY NGDPLNK ####
 
 import requests
 import os
 import locale
 from tkinter import messagebox
 
 APPDATA = os.environ.get("APPDATA")
-PROGRAM_PATH = os.path.join(APPDATA, "TLSoftware", "SSTools4MC") # type: ignore
+PROGRAM_PATH = os.path.join(APPDATA, "SSTools4MC") # type: ignore
 ASSETS_PATH = os.path.join(PROGRAM_PATH, "assets")
 CODE_PATH = os.path.join(PROGRAM_PATH, "main.py")
 ICON_PATH = os.path.join(PROGRAM_PATH, "assets", "icon.ico")
@@ -28,18 +28,12 @@ try:
         icon = requests.get("https://raw.githubusercontent.com/ngdplnk/SSTools4MC/main/1-release/icon.ico")
         with open(ICON_PATH, 'wb') as writeicon:
             writeicon.write(icon.content)
-    if os.name == 'nt':  # Windows
-        os.system(f"start cmd /c python {CODE_PATH}")
-    else:  # Linux and other Unix-like systems
-        os.system(f"gnome-terminal -- python3 {CODE_PATH}")
+    os.system(f"start cmd /c python {CODE_PATH}")
 except Exception:
     if os.path.isfile(CODE_PATH):
-        if os.name == 'nt':  # Windows
-            os.system(f"start cmd /c python {CODE_PATH}")
-        else:  # Linux and other Unix-like systems
-            os.system(f"gnome-terminal -- python3 {CODE_PATH}")
+        os.system(f"start cmd /c python {CODE_PATH}")
     else:
-        if system_lang.startswith('Spanish') or system_lang.startswith('es'):
+        if system_lang.startswith('es') or system_lang.startswith('Spanish'):
             messagebox.showerror("Error", "Conéctate a internet para obtener la última versión de SSTools4MC.")
         else:
             messagebox.showerror("Error", "Connect to the internet to get the latest version of SSTools4MC.")
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 NGDPL Nk
+Copyright (c) 2021-2024 ngdplnk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -128,4 +128,4 @@ Credits to [Alfredo Creates on Flaticon for creating the icon used in SSTools4MC
 
 Thank you for using SSTools4MC!
 
-Licensed under [MIT License](https://opensource.org/license/mit) - Copyright © 2024 @ngdplnk
+Licensed under [MIT License](https://opensource.org/license/mit) - Copyright © 2024 ngdplnk
diff --git a/SECURITY.md b/SECURITY.md
@@ -33,6 +33,7 @@ Are this versions supported?
 - PRE-v1.0 → :x:
 - v1.0 → :x:
 - v1.1 → ✔️
+- v1.2 → ✔️
 
 ## License and Copyright
 All tools in this repository are distributed under the MIT License. Please refer to the LICENSE.md file for complete details on the terms of the license and copyright.
@@ -42,4 +43,4 @@ This security policy will be reviewed and updated periodically to ensure it alig
 
 Thank you for contributing to the security of our project. Your collaboration is essential to maintaining a safe and reliable environment for all users of our Minecraft server tools.
 
-©2024 - TLSoftware - NGDPL Nk
+Copyright © 2024 ngdplnk