diff --git a/.gitignore b/.gitignore index 933083262..3aac68d64 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ # Atlassian Stuff /atlassian-ide-plugin.xml +/nulllocale_override.properties diff --git a/Changelog.txt b/Changelog.txt index 815f6fd34..620ce8497 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,4 +1,5 @@ Version 2.1.219 + Fixed wiki url being incorrect in commands Added support for various new things from Minecraft 1.20 Fixed double drop issue with Beetroots Added 'Camel' to taming experience in experience.yml diff --git a/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java b/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java index c7fa9da4f..4cac6d1e5 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java +++ b/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java @@ -4,7 +4,7 @@ public class McMMOUrl { public static final String urlWebsite = "https://www.mcmmo.org"; public static final String urlDiscord = "https://discord.gg/bJ7pFS9"; public static final String urlPatreon = "https://www.patreon.com/nossr50"; - public static final String urlWiki = "https://www.mcmmo.org/wiki/"; + public static final String urlWiki = "https://wiki.mcmmo.org/"; public static final String urlSpigot = "https://spigot.mcmmo.org"; public static final String urlTranslate = "https://translate.mcmmo.org/"; diff --git a/src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java b/src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java index 5506b6685..e6961de1d 100644 --- a/src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java +++ b/src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java @@ -69,7 +69,7 @@ public class TextComponentFactory { TextComponent.Builder wikiLinkComponent = Component.text().content(LocaleLoader.getString("Overhaul.mcMMO.MmoInfo.Wiki")); wikiLinkComponent.decoration(TextDecoration.UNDERLINED, true); - String wikiUrl = "https://mcmmo.org/wiki/"+subskillformatted; + String wikiUrl = "https://wiki.mcmmo.org/"+subskillformatted; wikiLinkComponent.clickEvent(ClickEvent.openUrl(wikiUrl));