From 35142f108f761770f509137e5b79b4a0024d38cd Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 20 Jan 2025 17:03:18 +0100 Subject: [PATCH 1/2] Update Links to new Website --- .../steamwar/messages/BungeeCore.properties | 24 +++++++++---------- .../messages/BungeeCore_de.properties | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties index d9ddc86e..8a9316ee 100644 --- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties +++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties @@ -369,23 +369,23 @@ R_USAGE=§8/§7r §8[§eanswer§8] #RegelnCommand REGELN_RULES=§7§lRules REGELN_AS=§eAirShip §7Rules -REGELN_AS_HOVER=§7https://steamwar.de/spielmodi/airship-regelwerk/ -REGELN_AS_URL=https://steamwar.de/spielmodi/airship-regelwerk/ +REGELN_AS_HOVER=§7https://steamwar.de/en/rules/airship +REGELN_AS_URL=https://steamwar.de/en/rules/airship REGELN_MWG=§eMiniWarGear §7Rules -REGELN_MWG_HOVER=§7https://steamwar.de/spielmodi/miniwargear-regelwerk/ -REGELN_MWG_URL=https://steamwar.de/spielmodi/miniwargear-regelwerk/ +REGELN_MWG_HOVER=§7https://steamwar.de/en/rules/miniwargear +REGELN_MWG_URL=https://steamwar.de/en/rules/miniwargear REGELN_WG=§eWarGear §7Rules -REGELN_WG_HOVER=§7https://steamwar.de/spielmodi/wargear-regelwerk/ -REGELN_WG_URL=https://steamwar.de/spielmodi/wargear-regelwerk/ +REGELN_WG_HOVER=§7https://steamwar.de/en/rules/wargear +REGELN_WG_URL=https://steamwar.de/en/rules/wargear REGELN_WS=§eWarShip §7Rules -REGELN_WS_HOVER=§7https://steamwar.de/spielmodi/warship-regelwerk/ -REGELN_WS_URL=https://steamwar.de/spielmodi/warship-regelwerk/ +REGELN_WS_HOVER=§7https://steamwar.de/en/rules/warship +REGELN_WS_URL=https://steamwar.de/en/rules/warship REGELN_QG=§eQuickGear §7Rules -REGELN_QG_HOVER=§7https://steamwar.de/spielmodi/quickgear-regelwerk/ -REGELN_QG_URL=https://steamwar.de/spielmodi/quickgear-regelwerk/ +REGELN_QG_HOVER=§7https://steamwar.de/en/rules/quickgear +REGELN_QG_URL=https://steamwar.de/enrules/quickgear REGELN_CONDUCT=§eCode of conduct -REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien/ -REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien/ +REGELN_CONDUCT_HOVER=§7https://steamwar.de/en/code-of-conduct +REGELN_CONDUCT_URL=https://steamwar.de/en/code-of-conduct #ReplayCommand REPLAY_TITLE=Most recent fights diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties index 364988e1..416edb77 100644 --- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties +++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties @@ -350,23 +350,23 @@ R_USAGE=§8/§7r §8[§eAntwort§8] #RegelnCommand REGELN_RULES=§7§lRegelwerke REGELN_AS=§eAirShip§8-§7Regelwerk -REGELN_AS_HOVER=§7https://steamwar.de/spielmodi/airship-regelwerk/ -REGELN_AS_URL=https://steamwar.de/spielmodi/airship-regelwerk/ +REGELN_AS_HOVER=§7https://steamwar.de/regeln/airship +REGELN_AS_URL=https://steamwar.de/regeln/airship REGELN_MWG=§eMiniWarGear§8-§7Regelwerk -REGELN_MWG_HOVER=§7https://steamwar.de/spielmodi/miniwargear-regelwerk/ -REGELN_MWG_URL=https://steamwar.de/spielmodi/miniwargear-regelwerk/ +REGELN_MWG_HOVER=§7https://steamwar.de/regeln/miniwargear +REGELN_MWG_URL=https://steamwar.de/regeln/miniwargear REGELN_WG=§eWarGear§8-§7Regelwerk -REGELN_WG_HOVER=§7https://steamwar.de/spielmodi/wargear-regelwerk/ -REGELN_WG_URL=https://steamwar.de/spielmodi/wargear-regelwerk/ +REGELN_WG_HOVER=§7https://steamwar.de/regeln/wargear +REGELN_WG_URL=https://steamwar.de/regeln/wargear REGELN_WS=§eWarShip§8-§7Regelwerk -REGELN_WS_HOVER=§7https://steamwar.de/spielmodi/warship-regelwerk/ -REGELN_WS_URL=https://steamwar.de/spielmodi/warship-regelwerk/ +REGELN_WS_HOVER=§7https://steamwar.de/regeln/warship +REGELN_WS_URL=https://steamwar.de/regeln/warship REGELN_QG=§eQuickGear§8-§7Regelwerk -REGELN_QG_HOVER=§7https://steamwar.de/spielmodi/quickgear-regelwerk/ -REGELN_QG_URL=https://steamwar.de/spielmodi/quickgear-regelwerk/ +REGELN_QG_HOVER=§7https://steamwar.de/regeln/quickgear +REGELN_QG_URL=https://steamwar.de/regeln/quickgear REGELN_CONDUCT=§eVerhaltensrichtlinien -REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien/ -REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien/ +REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien +REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien #ReplayCommand REPLAY_TITLE=Letzte Kämpfe From b4accdf0a1f9e43f70d68940ebeaf4d8f9c57b0c Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 20 Jan 2025 17:08:24 +0100 Subject: [PATCH 2/2] Update Links to new Website --- .../src/de/steamwar/messages/BungeeCore.properties | 9 ++------- .../src/de/steamwar/messages/BungeeCore_de.properties | 6 ------ .../de/steamwar/velocitycore/commands/RulesCommand.java | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties index 8a9316ee..c9527253 100644 --- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties +++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties @@ -369,23 +369,18 @@ R_USAGE=§8/§7r §8[§eanswer§8] #RegelnCommand REGELN_RULES=§7§lRules REGELN_AS=§eAirShip §7Rules -REGELN_AS_HOVER=§7https://steamwar.de/en/rules/airship REGELN_AS_URL=https://steamwar.de/en/rules/airship REGELN_MWG=§eMiniWarGear §7Rules -REGELN_MWG_HOVER=§7https://steamwar.de/en/rules/miniwargear REGELN_MWG_URL=https://steamwar.de/en/rules/miniwargear REGELN_WG=§eWarGear §7Rules -REGELN_WG_HOVER=§7https://steamwar.de/en/rules/wargear REGELN_WG_URL=https://steamwar.de/en/rules/wargear REGELN_WS=§eWarShip §7Rules -REGELN_WS_HOVER=§7https://steamwar.de/en/rules/warship REGELN_WS_URL=https://steamwar.de/en/rules/warship REGELN_QG=§eQuickGear §7Rules -REGELN_QG_HOVER=§7https://steamwar.de/en/rules/quickgear -REGELN_QG_URL=https://steamwar.de/enrules/quickgear +REGELN_QG_URL=https://steamwar.de/en/rules/quickgear REGELN_CONDUCT=§eCode of conduct -REGELN_CONDUCT_HOVER=§7https://steamwar.de/en/code-of-conduct REGELN_CONDUCT_URL=https://steamwar.de/en/code-of-conduct +URL_FORMAT=§7{0} #ReplayCommand REPLAY_TITLE=Most recent fights diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties index 416edb77..c50cf682 100644 --- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties +++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties @@ -350,22 +350,16 @@ R_USAGE=§8/§7r §8[§eAntwort§8] #RegelnCommand REGELN_RULES=§7§lRegelwerke REGELN_AS=§eAirShip§8-§7Regelwerk -REGELN_AS_HOVER=§7https://steamwar.de/regeln/airship REGELN_AS_URL=https://steamwar.de/regeln/airship REGELN_MWG=§eMiniWarGear§8-§7Regelwerk -REGELN_MWG_HOVER=§7https://steamwar.de/regeln/miniwargear REGELN_MWG_URL=https://steamwar.de/regeln/miniwargear REGELN_WG=§eWarGear§8-§7Regelwerk -REGELN_WG_HOVER=§7https://steamwar.de/regeln/wargear REGELN_WG_URL=https://steamwar.de/regeln/wargear REGELN_WS=§eWarShip§8-§7Regelwerk -REGELN_WS_HOVER=§7https://steamwar.de/regeln/warship REGELN_WS_URL=https://steamwar.de/regeln/warship REGELN_QG=§eQuickGear§8-§7Regelwerk -REGELN_QG_HOVER=§7https://steamwar.de/regeln/quickgear REGELN_QG_URL=https://steamwar.de/regeln/quickgear REGELN_CONDUCT=§eVerhaltensrichtlinien -REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien #ReplayCommand diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java index cf403c4d..e379d6b1 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java @@ -36,6 +36,6 @@ public class RulesCommand extends SWCommand { sender.system("REGELN_RULES"); for(String ruleset : Arrays.asList("REGELN_AS", "REGELN_MWG", "REGELN_WG", "REGELN_WS", "REGELN_QG", "REGELN_CONDUCT")) - sender.prefixless(ruleset, new Message(ruleset + "_HOVER"), ClickEvent.openUrl(sender.parseToPlain(ruleset + "_URL"))); + sender.prefixless(ruleset, new Message("URL_FORMAT", sender.parseToPlain(ruleset + "_URL")), ClickEvent.openUrl(sender.parseToPlain(ruleset + "_URL"))); } }