Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-22 10:36:09 +01:00
Code Issues Projects Releases Wiki Activity

NEW localization system. Option to disable Yes/No per #193. Bump version

Browse Source
This commit is contained in:
HappyPikachu 2018-01-07 04:21:37 -05:00
parent e5546b7f8e
commit 4b5ecf14f8
5 changed files with 180 additions and 1013 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>me.blackvein.quests</groupId>
<artifactId>quests</artifactId>
<version>3.1.9</version>
<version>3.2.0</version>
<name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url>
<packaging>jar</packaging>

145
src/main/java/me/blackvein/quests/Quests.java
View File

@ -13,9 +13,13 @@
package me.blackvein.quests;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@ -24,18 +28,19 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.DyeColor;
@ -110,6 +115,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
public static boolean useCompass = true;
public static boolean ignoreLockedQuests = false;
public static boolean genFilesOnJoin = true;
public static boolean askConfirmation = true;
public static int acceptTimeout = 20;
public static int maxQuests = 0;
public static String effect = "note";
@ -151,7 +157,6 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
@SuppressWarnings("serial")
class StageFailedException extends Exception {
}
@SuppressWarnings("serial")
class SkipQuest extends Exception {
}
@ -169,14 +174,20 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
linkOtherPlugins();
// Save resources
saveResource("quests.yml", false);
saveResource("events.yml", false);
saveResource("data.yml", false);
saveResourceAs("quests.yml", "quests.yml", false);
saveResourceAs("events.yml", "events.yml", false);
saveResourceAs("data.yml", "data.yml", false);
// Load stuff
loadConfig();
loadModules();
defaultLangFile();
try {
setupLang();
} catch (IOException e) {
e.printStackTrace();
} catch (URISyntaxException e) {
e.printStackTrace();
}
loadData();
loadCommands();
@ -191,15 +202,68 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
delayLoadQuestInfo();
}
private void defaultLangFile() {
lang.initPhrases();
if (new File(this.getDataFolder(), File.separator + "lang" + File.separator + "en" + File.separator + "strings.yml").exists() == false) {
getLogger().info("Translation data not found, writing defaults to file.");
lang.saveNewLang();
} else {
private void setupLang() throws IOException, URISyntaxException {
final String path = "lang";
final File jarFile = new File(getClass().getProtectionDomain().getCodeSource().getLocation().getPath());
if(jarFile.isFile()) {
final JarFile jar = new JarFile(jarFile);
final Enumeration<JarEntry> entries = jar.entries(); //ALL entries in jar
Set<String> results = new HashSet<String>();
while(entries.hasMoreElements()) {
final String name = entries.nextElement().getName();
if (name.startsWith(path + "/") && name.contains("strings.yml")) {
results.add(name);
}
}
for (String resourcePath : results) {
saveResourceAs(resourcePath, resourcePath, false);
saveResourceAs(resourcePath, resourcePath.replace(".yml", "_new.yml"), true);
}
jar.close();
}
try {
lang.loadLang();
} catch (InvalidConfigurationException e) {
e.printStackTrace();
}
}
public void saveResourceAs(String resourcePath, String outputPath, boolean replace) {
if (resourcePath == null || resourcePath.equals("")) {
throw new IllegalArgumentException("ResourcePath cannot be null or empty");
}
resourcePath = resourcePath.replace('\\', '/');
InputStream in = getResource(resourcePath);
if (in == null) {
throw new IllegalArgumentException("The embedded resource '" + resourcePath + "' cannot be found in Quests jar");
}
File outFile = new File(getDataFolder(), outputPath);
int lastIndex = resourcePath.lastIndexOf('/');
File outDir = new File(getDataFolder(), outputPath.substring(0, lastIndex >= 0 ? lastIndex : 0));
if (!outDir.exists()) {
outDir.mkdirs();
}
try {
if (!outFile.exists() || replace) {
OutputStream out = new FileOutputStream(outFile);
byte[] buf = new byte[1024];
int len;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
}
out.close();
in.close();
} /*else {
getLogger().log(Level.WARNING, "Could not save " + outFile.getName() + " to " + outFile + " because " + outFile.getName() + " already exists.");
}*/
} catch (IOException ex) {
getLogger().log(Level.SEVERE, "Could not save " + outFile.getName() + " to " + outFile, ex);
}
}
private void delayLoadQuestInfo() {
getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
@ -360,26 +424,36 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
@Override
public String getPromptText(ConversationContext context) {
return ChatColor.YELLOW + Lang.get("acceptQuest") + " " + ChatColor.GREEN + Lang.get("yesWord") + " / " + Lang.get("noWord");
/*if (!askConfirmation) {
Player player = (Player) context.getForWhom();
getQuester(player.getUniqueId()).takeQuest(getQuest(getQuester(player.getUniqueId()).questToTake), false);
return "";
} else {*/
return ChatColor.YELLOW + Lang.get("acceptQuest") + " " + ChatColor.GREEN + Lang.get("yesWord") + " / " + Lang.get("noWord");
//}
}
@Override
public Prompt acceptInput(ConversationContext context, String s) {
Player player = (Player) context.getForWhom();
if (s.equalsIgnoreCase(Lang.get("yesWord"))) {
try {
getQuester(player.getUniqueId()).takeQuest(getQuest(getQuester(player.getUniqueId()).questToTake), false);
} catch (Exception e) {
e.printStackTrace();
/*if (!askConfirmation) {
return Prompt.END_OF_CONVERSATION;
} else {*/
Player player = (Player) context.getForWhom();
if (s.equalsIgnoreCase(Lang.get("yesWord"))) {
try {
getQuester(player.getUniqueId()).takeQuest(getQuest(getQuester(player.getUniqueId()).questToTake), false);
} catch (Exception e) {
e.printStackTrace();
}
return Prompt.END_OF_CONVERSATION;
} else if (s.equalsIgnoreCase(Lang.get("noWord"))) {
player.sendMessage(ChatColor.YELLOW + Lang.get("cancelled"));
return Prompt.END_OF_CONVERSATION;
} else {
player.sendMessage(ChatColor.RED + Lang.get("questInvalidChoice"));
return new QuestPrompt();
}
return Prompt.END_OF_CONVERSATION;
} else if (s.equalsIgnoreCase(Lang.get("noWord"))) {
player.sendMessage(ChatColor.YELLOW + Lang.get("cancelled"));
return Prompt.END_OF_CONVERSATION;
} else {
player.sendMessage(ChatColor.RED + Lang.get("questInvalidChoice"));
return new QuestPrompt();
}
//}
}
}
@ -393,7 +467,12 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
public void loadConfig() {
FileConfiguration config = getConfig();
Lang.iso = config.getString("language", "en");
if (config.getString("language").equalsIgnoreCase("en")) {
//Legacy
Lang.iso = "en-US";
} else {
Lang.iso = config.getString("language", "en-US");
}
allowCommands = config.getBoolean("allow-command-questing", true);
allowCommandsForNpcQuests = config.getBoolean("allow-command-quests-with-npcs", false);
showQuestReqs = config.getBoolean("show-requirements", true);
@ -401,6 +480,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
allowQuitting = config.getBoolean("allow-quitting", true);
useCompass = config.getBoolean("use-compass", true);
genFilesOnJoin = config.getBoolean("generate-files-on-join", true);
askConfirmation = config.getBoolean("ask-confirmation", true);
npcEffects = config.getBoolean("npc-effects.enabled", true);
effect = config.getString("npc-effects.new-quest", "note");
redoEffect = config.getString("npc-effects.redo-quest", "angry_villager");
@ -1897,8 +1977,13 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
reloadConfig();
loadConfig();
Lang.clearPhrases();
lang.initPhrases();
lang.loadLang();
try {
lang.loadLang();
} catch (InvalidConfigurationException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
for (Quester quester : questers.values()) {
for (Quest q : quester.currentQuests.keySet()) {
quester.checkQuest(q);

12
src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java
View File

@ -108,7 +108,11 @@ public class QuestAcceptPrompt extends StringPrompt {
for (String msg : s.split("<br>")) {
player.sendMessage(msg);
}
plugin.conversationFactory.buildConversation((Conversable) player).begin();
if (!Quests.askConfirmation) {
plugin.getQuester(player.getUniqueId()).takeQuest(plugin.getQuest(plugin.getQuester(player.getUniqueId()).questToTake), false);
} else {
plugin.conversationFactory.buildConversation((Conversable) player).begin();
}
} else {
player.sendMessage(q.failRequirements);
}
@ -134,7 +138,11 @@ public class QuestAcceptPrompt extends StringPrompt {
for (String msg : s.split("<br>")) {
player.sendMessage(msg);
}
plugin.conversationFactory.buildConversation((Conversable) player).begin();
if (!Quests.askConfirmation) {
plugin.getQuester(player.getUniqueId()).takeQuest(plugin.getQuest(plugin.getQuester(player.getUniqueId()).questToTake), false);
} else {
plugin.conversationFactory.buildConversation((Conversable) player).begin();
}
}
} else if (quester.currentQuests.containsKey(q) == false) {
String msg = Lang.get("questMaxAllowed");

1019
src/main/java/me/blackvein/quests/util/Lang.java
View File

File diff suppressed because it is too large Load Diff

15
src/main/resources/config.yml
View File

@ -1,20 +1,21 @@
# See https://github.com/FlyingPikachu/Quests/wiki/Configuration
language: en
allow-command-questing: true
allow-command-quests-with-npcs: false
show-requirements: true
show-titles: true
allow-quitting: true
use-compass: true
ignore-locked-quests: false
ask-confirmation: true
convert-data-on-startup: false
generate-files-on-join: true
ignore-locked-quests: false
kill-delay: 600
language: en-US
max-quests: 0
npc-effects:
enabled: true
new-quest: note
redo-quest: angry_villager
max-quests: 0
convert-data-on-startup: false
show-requirements: true
show-titles: true
use-compass: true
quester-blacklist:
- UUID
- UUID