Rename to TaystJK

.github/workflows/build.yml

@@ -227,7 +227,7 @@ jobs:
  working-directory: ${{ github.workspace }}/install/JediAcademy
  shell: bash
  run: |
- chmod +x eternaljk.x86_64.app/Contents/MacOS/eternaljk.x86_64
+ chmod +x taystjk.x86_64.app/Contents/MacOS/taystjk.x86_64
  tar -czvf TaystJK-macos-${{ matrix.arch }}-${{ matrix.build_type }}-${{ matrix.portable }}.tar.gz *
 
  - uses: actions/upload-artifact@v4
@@ -294,7 +294,7 @@ jobs:
  working-directory: ${{ github.workspace }}/install/JediAcademy
  shell: bash
  run: |
- chmod +x eternaljk.arm64.app/Contents/MacOS/eternaljk.arm64
+ chmod +x taystjk.arm64.app/Contents/MacOS/taystjk.arm64
  tar -czvf TaystJK-macos-${{ matrix.arch }}-${{ matrix.build_type }}-${{ matrix.portable }}.tar.gz *
 
  - uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -21,7 +21,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment ver
 
 set(InOpenJK ON)
 
-set(ProjectName "EternalJK" CACHE STRING "Project Name")
+set(ProjectName "TaystJK" CACHE STRING "Project Name")
 project(${ProjectName})
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -33,10 +33,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 #=============================================================================
 option(BuildPortableVersion "Build portable version (does not read or write files from your user/home directory" OFF)
 
-option(BuildMPEngine "Whether to create projects for the MP client (eternaljk.x86.exe)" ON)
-option(BuildMPRdVanilla "Whether to create projects for the MP default renderer (rd-eternaljk_x86.dll)" ON)
+option(BuildMPEngine "Whether to create projects for the MP client (taystjk.x86.exe)" ON)
+option(BuildMPRdVanilla "Whether to create projects for the MP default renderer (rd-taystjk_x86.dll)" ON)
 option(BuildMPRdVulkan "Whether to create projects for the MP vulkan renderer (rd-vulkan_x86.dll)" ON)
-option(BuildMPDed "Whether to create projects for the MP dedicated server (eternaljkded.exe)" ON)
+option(BuildMPDed "Whether to create projects for the MP dedicated server (taystjkded.exe)" ON)
 option(BuildMPGame "Whether to create projects for the MP server-side gamecode (jampgamex86.dll)" ON)
 option(BuildMPCGame "Whether to create projects for the MP clientside gamecode (cgamex86.dll)" ON)
 option(BuildMPUI "Whether to create projects for the MP UI code (uix86.dll)" ON)
@@ -146,11 +146,11 @@ endif()
 # Binary names
 #
 #=============================================================================
-set(MPEngine "eternaljk.${Architecture}")
-set(MPVanillaRenderer "rd-eternaljk_${Architecture}")
-set(MPVulkanRenderer "rd-vulkan_${Architecture}")
-set(MPRend2 "rd-rend2e_${Architecture}")
-set(MPDed "eternaljkded.${Architecture}")
+set(MPEngine "taystjk.${Architecture}")
+set(MPVanillaRenderer "rd-taystjk_${Architecture}")
+set(MPVulkanRenderer "rd-vulkant_${Architecture}")
+set(MPRend2 "rd-rend2t_${Architecture}")
+set(MPDed "taystjkded.${Architecture}")
 set(MPGame "jampgame${Architecture}")
 set(MPCGame "cgame${Architecture}")
 set(MPUI "ui${Architecture}")

assets/japro/ui/jamp/ingame_setup.menu

@@ -861,7 +861,7 @@
  textscale 1
  style WINDOW_STYLE_FILLED
  forecolor .615 .615 .956 1
- cvarStrList { "Vanilla" , "rd-eternaljk" , "Vulkan", "rd-vulkan", "Rend2" , "rd-rend2e" }
+ cvarStrList { "Vanilla" , "rd-taystjk" , "Vulkan", "rd-vulkant", "Rend2" , "rd-rend2t" }
  descText "Change the renderer library to use."
  cvar "ui_cl_renderer"
  visible 1
@@ -1640,7 +1640,7 @@
  visible 0
  descText "Configure rend2 video options"
  cvarTest "cl_renderer"
- hideCvar { "rd-eternaljk" , "rd-vulkan" }
+ hideCvar { "rd-taystjk" , "rd-vulkan" }
 
  action
  {
@@ -1676,7 +1676,7 @@
  visible 0
  descText "Rend2 video settings"
  cvarTest "cl_renderer"
- hideCvar { "rd-eternaljk" , "rd-vulkan" }
+ hideCvar { "rd-taystjk" , "rd-vulkan" }
 
  action
  {

assets/japro/ui/jamp/setup.menu

@@ -1032,7 +1032,7 @@
  font 4
  textscale 1
  forecolor .615 .615 .956 1
- cvarStrList { "Vanilla" , "rd-eternaljk" , "Vulkan", "rd-vulkan", "Rend2" , "rd-rend2e" }
+ cvarStrList { "Vanilla" , "rd-taystjk" , "Vulkan", "rd-vulkant", "Rend2" , "rd-rend2t" }
  descText "Change the renderer library to use."
  cvar "ui_cl_renderer"
  visible 1
@@ -1428,7 +1428,7 @@
  visible 0
  descText "Advanced video settings"
  cvarTest "cl_renderer"
- hideCvar { "rd-eternaljk" , "rd-vulkan" }
+ hideCvar { "rd-taystjk" , "rd-vulkan" }
 
  action
  {
@@ -1465,7 +1465,7 @@
  visible 0
  descText "Advanced video settings"
  cvarTest "cl_renderer"
- hideCvar { "rd-eternaljk" , "rd-vulkan" }
+ hideCvar { "rd-taystjk" , "rd-vulkan" }
 
  action
  {

codemp/CMakeLists.txt

@@ -782,15 +782,15 @@ endif(BuildMPDed)
 
 install(FILES
  ${CMAKE_CURRENT_BINARY_DIR}/japro-assets.pk3
- DESTINATION "${JKAInstallDir}/EternalJK"
+ DESTINATION "${JKAInstallDir}/taystjk"
  COMPONENT ${JKAMPCoreComponent})
 
 install(FILES
  ${CMAKE_SOURCE_DIR}/assets/settings/cosmetics/example.cosmetic
- DESTINATION "${JKAInstallDir}/EternalJK/settings/cosmetics/hats/"
+ DESTINATION "${JKAInstallDir}/taystjk/settings/cosmetics/hats/"
  COMPONENT ${JKAMPCoreComponent})
 
 install(FILES
  ${CMAKE_SOURCE_DIR}/assets/settings/cosmetics/example.cosmetic
- DESTINATION "${JKAInstallDir}/EternalJK/settings/cosmetics/capes/"
+ DESTINATION "${JKAInstallDir}/taystjk/settings/cosmetics/capes/"
  COMPONENT ${JKAMPCoreComponent})

codemp/cgame/CMakeLists.txt

@@ -159,17 +159,17 @@ endif()
 if(MakeApplicationBundles AND BuildMPEngine)
  install(TARGETS ${MPCGame}
  LIBRARY
- DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/EternalJK"
+ DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/taystjk"
  COMPONENT ${JKAMPCoreComponent})
 elseif(WIN32)
  install(TARGETS ${MPCGame}
  RUNTIME
- DESTINATION "${JKAInstallDir}/EternalJK"
+ DESTINATION "${JKAInstallDir}/taystjk"
  COMPONENT ${JKAMPCoreComponent})
 else()
  install(TARGETS ${MPCGame}
  LIBRARY
- DESTINATION "${JKAInstallDir}/EternalJK"
+ DESTINATION "${JKAInstallDir}/taystjk"
  COMPONENT ${JKAMPCoreComponent})
 endif()
 

codemp/client/cl_main.cpp

@@ -2700,7 +2700,7 @@ static IHeapAllocator *GetG2VertSpaceServer( void ) {
  return G2VertSpaceServer;
 }
 
-#define DEFAULT_RENDER_LIBRARY "rd-eternaljk"
+#define DEFAULT_RENDER_LIBRARY "rd-taystjk"
 
 void CL_InitRef( void ) {
  static refimport_t ri;

codemp/game/CMakeLists.txt

@@ -221,17 +221,17 @@ endif()
 if(MakeApplicationBundles AND BuildMPEngine)
  install(TARGETS ${MPGame}
  LIBRARY
- DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/EternalJK"
+ DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/taystjk"
  COMPONENT ${JKAMPCoreComponent})
 elseif(WIN32)
  install(TARGETS ${MPGame}
  RUNTIME
- DESTINATION "${JKAInstallDir}/EternalJK"
+ DESTINATION "${JKAInstallDir}/taystjk"
  COMPONENT ${JKAMPCoreComponent})
 else()
  install(TARGETS ${MPGame}
  LIBRARY
- DESTINATION "${JKAInstallDir}/EternalJK"
+ DESTINATION "${JKAInstallDir}/taystjk"
  COMPONENT ${JKAMPCoreComponent})
 endif()
 

codemp/qcommon/common.cpp

@@ -1565,7 +1565,7 @@ void Com_WriteConfigToFile( const char *filename ) {
  return;
  }
 
- FS_Printf (f, "// generated by EternalJK, do not modify\n");
+ FS_Printf (f, "// generated by TaystJK, do not modify\n");
  Key_WriteBindings (f);
  Cvar_WriteVariables (f);
  FS_FCloseFile( f );

codemp/qcommon/files.cpp

@@ -3898,7 +3898,7 @@ void FS_Startup( const char *gameName ) {
 #ifdef DEDICATED
  fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
 #else
- fs_basegame = Cvar_Get ("fs_basegame", ETERNALJKGAME, CVAR_INIT );
+ fs_basegame = Cvar_Get ("fs_basegame", TAYSTJKGAME, CVAR_INIT );
 #endif
  fs_portable = Cvar_Get ("fs_portable", "1", CVAR_INIT|CVAR_PROTECTED, "Disable fs_homepath and use only one folder for all game files" );
  homePath = Sys_DefaultHomePath();
@@ -3914,7 +3914,7 @@ void FS_Startup( const char *gameName ) {
 #ifdef DEDICATED
  fs_forcegame = Cvar_Get ("fs_forcegame", "", CVAR_INIT, "Folder to use for overriding of fs_game (can not be set by the server)." );
 #else
- fs_forcegame = Cvar_Get("fs_forcegame", "EternalJK", CVAR_INIT, "Folder to use for overriding of fs_game (can not be set by the server).");
+ fs_forcegame = Cvar_Get("fs_forcegame", TAYSTJKGAME, CVAR_INIT, "Folder to use for overriding of fs_game (can not be set by the server).");
 #endif
  // add search path elements in reverse priority order (lowest priority first)
  if (fs_cdpath->string[0]) {

codemp/qcommon/game_version.h

@@ -38,12 +38,12 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #define VERSION_STRING_DOTTED XSTRING(VERSION_MAJOR_RELEASE) "." XSTRING(VERSION_MINOR_RELEASE) "." XSTRING(VERSION_EXTERNAL_BUILD) "." XSTRING(VERSION_INTERNAL_BUILD) // "a.b.c.d"
 
 #if defined(_DEBUG)
- #define JK_VERSION "(debug)EternalJK: " GIT_TAG "-" GIT_HASH
+ #define JK_VERSION "(debug)TaystJK: " GIT_TAG "-" GIT_HASH
  #define JK_VERSION_OLD "(debug)JAmp: v" VERSION_STRING_DOTTED
 #elif defined (TOURNAMENT_CLIENT)
- #define JK_VERSION "EternalJK: Tournament Client: " GIT_TAG "-" GIT_HASH
+ #define JK_VERSION "TaystJK: Tournament Client: " GIT_TAG "-" GIT_HASH
  #define JK_VERSION_OLD "JAmp: v" VERSION_STRING_DOTTED
 #else
- #define JK_VERSION "EternalJK: " GIT_TAG "-" GIT_HASH
+ #define JK_VERSION "TaystJK: " GIT_TAG "-" GIT_HASH
  #define JK_VERSION_OLD "JAmp: v" VERSION_STRING_DOTTED
 #endif

codemp/qcommon/q_shared.h

@@ -27,16 +27,16 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 // q_shared.h -- included first by ALL program modules.
 // A user mod should never modify this file
 
-#define PRODUCT_NAME "eternaljk"
+#define PRODUCT_NAME "taystjk"
 
-#define CLIENT_WINDOW_TITLE "EternalJK"
-#define CLIENT_CONSOLE_TITLE "EternalJK Console"
-#define HOMEPATH_NAME_UNIX "EternalJK"
-#define HOMEPATH_NAME_WIN "EternalJK"
+#define CLIENT_WINDOW_TITLE "TaystJK"
+#define CLIENT_CONSOLE_TITLE "TaystJK Console"
+#define HOMEPATH_NAME_UNIX "TaystJK"
+#define HOMEPATH_NAME_WIN "TaystJK"
 #define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
 
 #define BASEGAME "base"
-#define ETERNALJKGAME "EternalJK"
+#define TAYSTJKGAME "taystjk"
 
 //NOTENOTE: Only change this to re-point ICARUS to a new script directory
 #define Q3_SCRIPT_DIR "scripts"

codemp/rd-vulkan/vk_instance.cpp

@@ -219,7 +219,7 @@ static void vk_create_instance( void )
 
  appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
  appInfo.pNext = NULL;
- appInfo.pApplicationName = "EternalJK";
+ appInfo.pApplicationName = "TaystJK";
  appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0);
  appInfo.pEngineName = "Quake3";
  appInfo.engineVersion = VK_MAKE_VERSION(1, 0, 0);

codemp/server/sv_ccmds.cpp

@@ -1792,7 +1792,7 @@ void SV_RecordDemo( client_t *cl, char *demoName ) {
  // Save metadata message if desired
  if (sv_demoWriteMeta->integer) {
  ssMeta << "{";
- ssMeta << "\"wr\":\"EternalJK_Server\""; // Writer (keyword used by other tools too to identify origin of demo)
+ ssMeta << "\"wr\":\"TaystJK_Server\""; // Writer (keyword used by other tools too to identify origin of demo)
 
  // Go through manually set metadata and add it.
  for (auto it = demoMetaData[cl - svs.clients].begin(); it != demoMetaData[cl - svs.clients].end(); it++) {