reduce usage of old branding in favour of "OpenRSC"

Android_Client/Open RSC Android Client/src/main/java/com/openrsc/android/render/RSCBitmapSurfaceView.java

@@ -167,7 +167,7 @@ private void drawLoadingScreen(String state, int percent) {
 			canvas.drawText(state, x + 138, y + 10, paint);
 
 			if (!this.m_hb) {
-				canvas.drawText("Powered by Open RuneScape Classic", x + 138, y + 30, paint);
+				canvas.drawText("Powered by OpenRSC", x + 138, y + 30, paint);
 				canvas.drawText("We support open source", x + 138, y + 44, paint);
 			} else {
 				paint.setColor(Color.rgb(132, 132, 152));

CONTRIBUTING.md

@@ -1,6 +1,6 @@
-# Contributing to Open RuneScape Classic
+# Contributing to OpenRSC
 
-We'd love for you to contribute to our source code and to make Open RuneScape Classic even better than it is
+We'd love for you to contribute to our source code and to make OpenRSC even better than it is
 today! Here are the guidelines we'd like you to follow:
 
 * [Merge Request Submission Guidelines](#submit-pr)

Commands.md

@@ -493,12 +493,12 @@ Moderator Commands
   - If no percentage is specified, then 100 is used.
 - jail
   - Usage: `::jail [name]`
-  - Puts the specified player in RuneScape Jail, upstairs of Al Kharid palace.
+  - Puts the specified player in Jail, upstairs of Al Kharid palace.
   - You can not jail a player who has already been jailed.
   - You can not jail a staff member.
 - release
   - Usage: `::release [name]`
-  - Releases the specified player from RuneScape Jail to the location they were before being jailed.
+  - Releases the specified player from Jail to the location they were before being jailed.
 - getcache
   - Usage: `::getcache (name) [cache_key]`
   - Alias: `::gcache` or `::checkcache`

Linux Getting Started Guide.md

@@ -1,4 +1,4 @@
-### Guide for running Open RuneScape Classic on Linux
+### Guide for running OpenRSC on Linux
 
 ## Using the built-in installation script with Docker
 

MacOS Getting Started Guide.md

@@ -1,4 +1,4 @@
-### Guide for running Open RuneScape Classic on MacOS
+### Guide for running OpenRSC on MacOS
 
 ## Step 1
 

PC_Launcher/README.md

@@ -1 +1 @@
-This is a PC launcher for the Open RuneScape Classic game worlds that was initially developed by Jaekr
+This is a PC launcher for the OpenRSC game worlds that was initially developed by Jaekr

PC_Launcher/src/main/java/launcher/Launcher.java

@@ -28,32 +28,32 @@ public void initializeLauncher() {
     } else if (Settings.firstRun) {
       int response = JOptionPane.showConfirmDialog(
           this,
-          "The Open RSC Launcher has an automatic update feature.\n"
+          "The OpenRSC Launcher has an automatic update feature.\n"
               + "\n"
               + "Would you like to enable this feature?\n",
-          "Open RuneScape Classic",
+          "OpenRSC",
           JOptionPane.YES_NO_OPTION,
           JOptionPane.INFORMATION_MESSAGE,
           icon);
       if (response == JOptionPane.YES_OPTION || response == JOptionPane.CLOSED_OPTION) {
         Settings.autoUpdate = true;
         JOptionPane.showMessageDialog(
             this,
-            "The Open RSC Launcher is set to check for updates at every launch!",
-            "Open RuneScape Classic",
+            "The OpenRSC Launcher is set to check for updates at every launch!",
+            "OpenRSC",
             JOptionPane.INFORMATION_MESSAGE,
             icon);
       } else if (response == JOptionPane.NO_OPTION) {
         Settings.autoUpdate = false;
         JOptionPane.showMessageDialog(
             this,
-            "The Open RSC launcher will not check for updates automatically.\n"
+            "The OpenRSC launcher will not check for updates automatically.\n"
                 + "\n"
                 + "You will not get notified when new releases are available. To update the launcher, you\n"
                 + "will need to do it manually by replacing 'OpenRSC.jar'.\n"
                 + "\n"
                 + "You can enable automatic updates again in the localSettings.conf file.",
-            "Open RuneScape Classic",
+            "OpenRSC",
             JOptionPane.INFORMATION_MESSAGE,
             icon);
       }
@@ -77,7 +77,7 @@ public void initializeLauncher() {
                 + "\n"
                 + "\n"
                 + "Would you like to update now?",
-            "Open RuneScape Classic",
+            "OpenRSC",
             JOptionPane.YES_NO_OPTION,
             JOptionPane.INFORMATION_MESSAGE,
             icon);
@@ -88,7 +88,7 @@ public void initializeLauncher() {
                 "The launcher has been updated successfully!\n"
                     + "\n"
                     + "The launcher requires a restart, and will now exit.",
-                "Open RuneScape Classic",
+                "OpenRSC",
                 JOptionPane.INFORMATION_MESSAGE,
                 icon);
             System.exit(0);
@@ -98,7 +98,7 @@ public void initializeLauncher() {
                 "The launcher has failed to update, please try again later.\n"
                     + "\n"
                     + "Would you like to continue without updating?",
-                "Open RuneScape Classic",
+                "OpenRSC",
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.ERROR_MESSAGE,
                 icon);

PC_Launcher/src/main/java/launcher/Settings.java

@@ -129,7 +129,7 @@ public static void saveSettings() {
       }
 
 			FileOutputStream out = new FileOutputStream(Main.configFileLocation + "/launcherSettings.conf");
-			props.store(out, "---open runescape classic launcher config---");
+			props.store(out, "---openrsc launcher config---");
 			out.close();
 		} catch (IOException e) {
 			Logger.Error("Could not save launcher settings!");

PC_Launcher/vet.rsc.OpenRSC.Launcher.desktop

@@ -2,8 +2,8 @@
 Type=Application
 Terminal=false
 Name=OpenRSC
-GenericName=Open Runescape Classic Launcher
-Comment=OpenRSC is a free, open-source launcher for various Runescape Classic (2001-2004) servers
+GenericName=OpenRSC Launcher
+Comment=OpenRSC is a free, open-source launcher for various Classic (2001-2004) RSC servers
 Keywords=games;runescape;rsc;openrsc;
 Exec=openrsc
 Icon=vet.rsc.OpenRSC.Launcher

README.md

@@ -1,6 +1,6 @@
 [![pipeline status](https://gitlab.com/open-runescape-classic/core/badges/master/pipeline.svg)](https://gitlab.com/open-runescape-classic/core/-/commits/master)
 
-# Open RuneScape Classic
+# OpenRSC
 
 # Table of contents <a name="top"></a>
 1. [Project Information](#general)
@@ -12,11 +12,11 @@
 7. [Thank you](#thankyou)
 
 ## Project Information<a name="general"></a>
-The original RuneScape Classic was closed down and abandoned after 17 years on August 6th, 2018. Through open source black box reverse engineering, the Open RuneScape Classic project team have brought forth Open RuneScape Classic (Open RSC) so that it may be enjoyed by fans once again. In this repository is everything needed to run the closest to authentic version of RuneScape Classic available. There are still issues to address but efforts are continually ongoing to fix them. This project has been built upon the efforts of the RuneScape Classic private server developer community spanning from 2008 to 2018. From the inception of the Open RSC project in June 2018, the team has reviewed thousands of hours of RSC+ replays to ensure an accurate and authentic in-game experience. We have rewritten the core server framework and expanded it to scale far beyond the original abilities of the original RuneScape Classic game. Included are several server configurations that allow many new game features to be activated without needing to change any code. Example: Runecrafting, running, custom sprites, faster game speeds, higher experience rates, new quests, auction house, clans, parties, pets, and so much more. We primarily use Discord to stay in touch and welcome anyone that would like to learn and help contribute code to the project. We host free to play public worlds as well - see our website for more information. One last thing: we do not accept any monetary donations whatsoever. This is a hobby and will only ever be a hobby. We don't believe anyone should profit using somebody else's work, even if it is considered abandonware.
+The original RSC was closed down and abandoned after nearly 18 years on August 6th, 2018. Through open-source cooperation & black box reverse engineering, the OpenRSC project has made it once again possible for fans to enjoy playing this game. In this repository is everything needed to run the closest to authentic version of RSC available. Efforts are continually ongoing to further improve authenticity and to add new features. This project has been built upon the efforts of the RSC private server developer community spanning from 2006 to 2018. From the inception of the Open RSC project in June 2018, the team has reviewed thousands of hours of RSC+ replays to ensure an accurate and authentic in-game experience. We have rewritten the core server framework and expanded it to scale far beyond the original abilities of the original RSC game. Included are several server configurations that allow many new game features to be activated without needing to change any code. Example: Runecrafting, custom sprites, faster game speeds, higher experience rates, new quests, auction house, clans, parties, pets, holiday events, and so much more. We primarily use Discord to stay in touch and welcome anyone that would like to learn and help contribute code to the project. We host free to play public worlds as well - see our website for more information. One last thing: we do not accept any monetary donations whatsoever. This is a hobby and will only ever be a hobby. We don't believe anyone should profit using somebody else's work, even if it is considered abandonware.
 
 
 ## How to Play<a name="play"></a>
-The Open RuneScape Classic project team suggests that before hosting a public server, developers learn the ins and outs of everything by running the game locally first.
+The OpenRSC team suggests that before hosting a public server, developers learn the ins and outs of everything by running the game locally first.
 
 <b>To run your own server locally, please see our guides:</b>
 - **Windows**: [Windows Getting Started Guide](https://github.com/Open-RSC/Core-Framework/blob/develop/Windows%20Getting%20Started%20Guide.md)
@@ -58,7 +58,7 @@ Feel free to submit bug reports in the repository issues section! If you would l
 
 - <a href="https://www.reddit.com/r/rsc">Reddit</a>
 
-- <a href="https://rsc.vet">Open RuneScape Classic Website</a>
+- <a href="https://rsc.vet">OpenRSC Website</a>
 
 
 ## In-Game Commands<a name="commands"></a>

Raspberry Pi Getting Started Guide .md

@@ -1,4 +1,4 @@
-### Guide for running Open RuneScape Classic on a Raspberry Pi 3b+ or newer
+### Guide for running OpenRSC on a Raspberry Pi 3b+ or newer
 
 The Raspberry Pi 3B+ (and earlier editions) do not have enough memory to run the game client and the game server at the same time. Raspberry Pi 4 and above with 2GB or more RAM are capable of running both.
 

Start-Linux.sh

@@ -11,7 +11,7 @@ function pause() {
 function start() {
     clear
     echo ""
-    echo "Open RuneScape Classic: Striving for a replica RSC game and more
+    echo "OpenRSC: Striving for a replica RSC game and more
 
 What would you like to do?
 
@@ -31,7 +31,7 @@ Choices:
     clear
 
     if [ "$action" == "1" ]; then # Compile and start the game
-        echo "Starting Open RuneScape Classic."
+        echo "Starting OpenRSC."
         make compile
         pause
         echo "What would you like to do?

Start-Windows.cmd

@@ -1,5 +1,5 @@
 @echo off
-:# Open RuneScape Classic: Striving for a replica RSC game and more
+:# OpenRSC: Striving for a replica RSC game and more
 
 :# Variable paths:
 SET Portable_Windows="Portable_Windows\"
@@ -55,7 +55,7 @@ exit
 :compileandrun
 cls
 echo:
-echo Starting Open RuneScape Classic.
+echo Starting OpenRSC.
 echo:
 cd Portable_Windows && call START "" compileandrun.cmd && cd ..
 echo:
@@ -67,7 +67,7 @@ goto start
 :run
 cls
 echo:
-echo Starting Open RuneScape Classic.
+echo Starting OpenRSC.
 echo:
 cd Portable_Windows && call START "" run.cmd && cd ..
 echo:
@@ -88,7 +88,7 @@ echo   %RED%3%NC% - 2001scape (RSC as it was in the beginning)
 echo   %RED%4%NC% - OpenPK (Stork PK recreation based on the OpenRSC framework. Currently in alpha)
 echo   %RED%5%NC% - Return
 echo:
-SET /P type=Please enter a number choice from above: 
+SET /P type=Please enter a number choice from above:
 echo:
 
 if /i "%type%"=="1" (SET newtype=default

Windows Getting Started Guide.md

@@ -1,8 +1,8 @@
-### Guide for running Open RuneScape Classic on Windows
+### Guide for running OpenRSC on Windows
 
 ## Install Java Development Kit (JDK)
 
-The Open RuneScape Classic project team recommends developers download Open JDK. A MSI installer for Windows is the simplest option. Any Java version 8 or later will work.
+The OpenRSC project recommends developers download Open JDK. A MSI installer for Windows is the simplest option. Any Java version 8 or later will work.
 
 <a href="https://adoptopenjdk.net/releases.html?variant=openjdk13&jvmVariant=hotspot">Download Adopt OpenJDK</a>
 

server/SERVER.md

@@ -52,7 +52,7 @@ dropping items, spawning game objects and ground items, and following other play
 
 ### Game Tick Events
 Game tick events are executed on a specific tick cycle, set in the config. This
-cycle is usually 600ms (Runescape's original tick timing), but has potential
+cycle is usually 640ms (the average tick cycle observed in 2018), but has potential
 to vary in custom servers. Game tick events handle most of the game's skill-based
 interactions, as well as a lot of other components.
 

server/plugins/com/openrsc/server/plugins/authentic/commands/Development.java

@@ -583,7 +583,7 @@ private void cycleScenery(Player player, String[] args) {
 		}
 		player.toggleDenyAllLogoutRequests();
 
-		player.message("Now displaying all scenery in RuneScape Classic in 5 second intervals.");
+		player.message("Now displaying all scenery in RSC in 5 second intervals.");
 
 		int maxScenery;
 		if (player.getConfig().RESTRICT_SCENERY_ID >= 0) {
@@ -606,7 +606,7 @@ private void cycleScenery(Player player, String[] args) {
 				return;
 			}
 		}
-		player.message("That is all of the scenery in RuneScape Classic!");
+		player.message("That is all of the scenery in RSC!");
 		player.message("If you'd like to see it lit from a different angle, I'd suggest editing map tile " + player.getLocation().pointToJagexPoint());
 		player.message("Then play this same replay again.");
 		delay(8);
@@ -623,7 +623,7 @@ private void cycleClothing(Player player, String[] args) {
 		boolean isRetroClient = player.isUsing38CompatibleClient() || player.isUsing39CompatibleClient();
 		int delayLen = Integer.parseInt(args[0]);
 
-		player.message("Now displaying all animations in RuneScape Classic in 5 second intervals.");
+		player.message("Now displaying all animations in RSC in 5 second intervals.");
 
 		for (int id = 0; id <= player.getClientLimitations().maxAnimationId; id++) {
 			player.message("animation id: " + (isRetroClient ? AppearanceRetroConverter.convert(id) : id));
@@ -635,7 +635,7 @@ private void cycleClothing(Player player, String[] args) {
 				return;
 			}
 		}
-		player.message("That is all of the animations in RuneScape Classic!");
+		player.message("That is all of the animations in RSC!");
 		delay(8);
 		player.toggleDenyAllLogoutRequests();
 	}
@@ -674,7 +674,7 @@ private void rotateObject(Player player, String command, String[] args) {
 
 		if (!player.getWorld().getServer().getConfig().WANT_CUSTOM_LANDSCAPE) {
 			player.message(messagePrefix + "@red@Warning: @dre@This function will only work for inauthentic clients!");
-			player.message("@dre@It is not possible to dynamically rotate scenery under any authentic protocol of RuneScape Classic.");
+			player.message("@dre@It is not possible to dynamically rotate scenery under any authentic protocol of RSC.");
 		}
 
 		if(!player.getWorld().withinWorld(x, y))

server/src/com/openrsc/server/ServerConfiguration.java

@@ -31,7 +31,7 @@ public class ServerConfiguration {
 	public String SERVER_NAME;
 	public String SERVER_NAME_WELCOME;
 	public String WELCOME_TEXT;
-	public String MESSAGE_PREFIX = "@gre@Runescape Classic:@whi@ ";
+	public String MESSAGE_PREFIX = "@gre@System message:@whi@ ";
 	public String BAD_SYNTAX_PREFIX = MESSAGE_PREFIX +" Invalid Syntax: ::";
 	public boolean MEMBER_WORLD;
 	public int WORLD_NUMBER;

server/src/com/openrsc/server/constants/Constants.java

@@ -222,7 +222,7 @@ public final Quests getQuests() {
 		put (2 + 64, "15781888"); // yellow "I overheard the player being abusive to someone else"
 		put (3 + 64, "5069823"); // blue "Trade scam - lied about trade to steal items from me"
 		put (4 + 64, "5069823"); // blue "Asking players for their password / trying to steal accounts"
-		put (5 + 64, "5069823"); // blue "Attempting to buy/sell a RuneScape account"
+		put (5 + 64, "5069823"); // blue "Attempting to buy/sell a RS account"
 		put (6 + 64, "16776960"); // ff0 yellow Impersonating Jagex Staff
 		put (7 + 64, "10949120"); // report abuse red "Advertising scam website"
 		put (8 + 64, "0"); // black "Other"

server/src/com/openrsc/server/net/Packet.java

@@ -153,7 +153,7 @@ public long readLong() {
 	}
 
 	/**
-	 * Reads a RuneScape string.
+	 * Reads an RSC string.
 	 *
 	 * @return The string.
 	 */
@@ -166,7 +166,7 @@ public String readString() {
 	}
 
 	/**
-	 * Reads a RuneScape string.
+	 * Reads an RSC string.
 	 *
 	 * @return The string.
 	 */
@@ -182,7 +182,7 @@ public String readZeroPaddedString() {
 	}
 
 	/**
-	 * Reads a RuneScape string.
+	 * Reads an RSC string.
 	 *
 	 * @return The string.
 	 */

server/src/com/openrsc/server/net/PacketBuilder.java

@@ -158,7 +158,7 @@ private void finalizeLength() {
 	}
 
 	/**
-	 * Writes a RuneScape string.
+	 * Writes an RSC string.
 	 *
 	 * @param string The string to write.
 	 * @return The PacketBuilder instance, for chaining.

server/src/com/openrsc/server/net/rsc/LoginPacketHandler.java

@@ -947,7 +947,7 @@ public int getVersion(int retrievedVersion, Player player) {
 		// The only clients we have with this behaviour are clients 39/40, but we can guess at the other times
 		// that the network protocol needed a new version.
 		switch (retrievedVersion) {
-			case 1: // initial RuneScape release
+			case 1: // initial RS release
 				return 14; // 2001-01-23
 			case 2:
 				// spellbook added