diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 8c627f937..d6c42d09f 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -214,7 +214,7 @@ public final class BotaniaAPI { registerModWiki("EnderIO", new SimpleWikiProvider("EnderIO Wiki", "http://wiki.enderio.com/%s")); registerModWiki("TropiCraft", new SimpleWikiProvider("Tropicraft Wiki", "http://wiki.tropicraft.net/wiki/%s")); registerModWiki("RandomThings", new SimpleWikiProvider("Random Things Wiki", "http://randomthingsminecraftmod.wikispaces.com/%s")); - registerModWiki("Witchery", new SimpleWikiProvider("Witchery Wiki", "https://sites.google.com/site/witcherymod/%s", "-")); + registerModWiki("Witchery", new SimpleWikiProvider("Witchery Wiki", "https://sites.google.com/site/witcherymod/%s", "-", true)); registerModWiki("AppliedEnergistics2", new SimpleWikiProvider("AE2 Wiki", "http://ae-mod.info/%s")); registerModWiki("BigReactors", technicWiki); registerModWiki("BuildCraft|Core", buildcraftWiki); diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 9e0fa81ed..bfa418986 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -20,15 +20,28 @@ import org.apache.commons.lang3.text.WordUtils; public class SimpleWikiProvider implements IWikiProvider { final String name, urlBase, replacement; + final boolean lowercase; public SimpleWikiProvider(String name, String urlBase) { this(name, urlBase, "%20"); } + public SimpleWikiProvider(String name, String urlBase, boolean lowercase) { + this(name, urlBase, "%20", lowercase); + } + public SimpleWikiProvider(String name, String urlBase, String replacement) { this.name = name; this.urlBase = urlBase; this.replacement = replacement; + this.lowercase = false; + } + + public SimpleWikiProvider(String name, String urlBase, String replacement, boolean lowercase) { + this.name = name; + this.urlBase = urlBase; + this.replacement = replacement; + this.lowercase = lowercase; } @Override @@ -61,7 +74,12 @@ public class SimpleWikiProvider implements IWikiProvider { String name = getBlockName(world, pos); if(name == null) return null; - return String.format(urlBase, WordUtils.capitalizeFully(name).replaceAll(" ", replacement)); + + if(lowercase) { + return String.format(urlBase, name.toLowerCase().replaceAll(" ", replacement)); + } else { + return String.format(urlBase, WordUtils.capitalizeFully(name).replaceAll(" ", replacement)); + } } @Override