Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-09-29 07:27:26 +02:00
Code Issues Projects Releases Wiki Activity

*generics

Browse Source 
*other stuff
This commit is contained in:
Zino 2013-07-16 14:26:36 +02:00
parent 8039dc601a
commit c2316aa844
2 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/me/blackvein/quests/Party.java
View File

@ -161,7 +161,8 @@ public class Party implements ConversationAbandonedListener, ColorUtil{
@Override @Override
public void conversationAbandoned(ConversationAbandonedEvent cae) { public void conversationAbandoned(ConversationAbandonedEvent cae) {
throw new UnsupportedOperationException("Not supported yet.");a //TODO: support this.
throw new UnsupportedOperationException("Not supported yet.");
} }
private static class PartyPrefix implements ConversationPrefix { private static class PartyPrefix implements ConversationPrefix {
@ -195,7 +196,7 @@ public class Party implements ConversationAbandonedListener, ColorUtil{
String inviterName = (String) context.getSessionData("inviter"); String inviterName = (String) context.getSessionData("inviter");
Quester quester = //Quester quester =
return Prompt.END_OF_CONVERSATION; return Prompt.END_OF_CONVERSATION;

62
src/me/blackvein/quests/Quests.java
View File

@ -1,15 +1,24 @@
package me.blackvein.quests; package me.blackvein.quests;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.mcMMO;
import java.io.File; import java.io.File;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager; import java.sql.DriverManager;
import java.sql.Statement; import java.sql.Statement;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.*; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumMap;
import java.util.HashMap;
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.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import me.ThaH3lper.com.EpicBoss; import me.ThaH3lper.com.EpicBoss;
import me.ThaH3lper.com.LoadBosses.LoadBoss; import me.ThaH3lper.com.LoadBosses.LoadBoss;
import me.blackvein.quests.prompts.QuestAcceptPrompt; import me.blackvein.quests.prompts.QuestAcceptPrompt;
@ -22,13 +31,25 @@ import net.citizensnpcs.api.npc.NPC;
import net.milkbowl.vault.Vault; import net.milkbowl.vault.Vault;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
import org.bukkit.*;
import org.bukkit.Bukkit;
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.conversations.*; import org.bukkit.conversations.Conversable;
import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.conversations.ConversationAbandonedListener;
import org.bukkit.conversations.ConversationContext;
import org.bukkit.conversations.ConversationFactory;
import org.bukkit.conversations.ConversationPrefix;
import org.bukkit.conversations.Prompt;
import org.bukkit.conversations.StringPrompt;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -40,6 +61,9 @@ import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.skills.SkillType;
public class Quests extends JavaPlugin implements ConversationAbandonedListener, ColorUtil { public class Quests extends JavaPlugin implements ConversationAbandonedListener, ColorUtil {
public static Economy economy = null; public static Economy economy = null;
@ -896,7 +920,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
} }
LinkedHashMap sortedMap = (LinkedHashMap) Quests.sort(questPoints); LinkedHashMap<String, Integer> sortedMap = (LinkedHashMap<String, Integer>) Quests.sort(questPoints);
int numPrinted = 0; int numPrinted = 0;
@ -959,7 +983,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
if(quester.currentQuest == null){ if(quester.currentQuest == null){
Party party = new Party(quester); Party party = new Party(this, quester);
if(broadcastPartyCreation) if(broadcastPartyCreation)
getServer().broadcastMessage(Party.partyPrefix + PINK + "" + BOLD + player.getName() + RESET + "" + PINK + " created a Quest Party!"); getServer().broadcastMessage(Party.partyPrefix + PINK + "" + BOLD + player.getName() + RESET + "" + PINK + " created a Quest Party!");
parties.add(party); parties.add(party);
@ -1073,7 +1097,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
if(getQuester(found.getName()).getParty() == null){ if(getQuester(found.getName()).getParty() == null){
a //TODO: do stuff?
}else{ }else{
player.sendMessage(Party.partyPrefix + RED + "" + BOLD + found.getName() + RESET + "" + RED + " is already in a party!"); player.sendMessage(Party.partyPrefix + RED + "" + BOLD + found.getName() + RESET + "" + RED + " is already in a party!");
@ -2321,7 +2345,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
List<String> itemsToDeliver; List<String> itemsToDeliver;
List<Integer> itemDeliveryTargetIds; List<Integer> itemDeliveryTargetIds;
ArrayList<String> deliveryMessages = new ArrayList(); ArrayList<String> deliveryMessages = new ArrayList<String>();
if (config.contains("quests." + s + ".stages.ordered." + s2 + ".items-to-deliver")) { if (config.contains("quests." + s + ".stages.ordered." + s2 + ".items-to-deliver")) {
@ -3344,15 +3368,15 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
return (permission != null); return (permission != null);
} }
private static Map sort(Map unsortedMap) { private static Map<String, Integer> sort(Map<String, Integer> unsortedMap) {
List list = new LinkedList(unsortedMap.entrySet()); List<Entry<String, Integer>> list = new LinkedList<Entry<String, Integer>>(unsortedMap.entrySet());
Collections.sort(list, new Comparator() { Collections.sort(list, new Comparator<Entry<String, Integer>>() {
@Override @Override
public int compare(Object o1, Object o2) { public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
int i = (Integer) (((Map.Entry) o1).getValue()); int i = o1.getValue();
int i2 = (Integer) (((Map.Entry) o2).getValue()); int i2 = o2.getValue();
if (i < i2) { if (i < i2) {
return 1; return 1;
} else if (i == i2) { } else if (i == i2) {
@ -3360,14 +3384,12 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
} else { } else {
return -1; return -1;
} }
} }
}); });
Map sortedMap = new LinkedHashMap(); Map<String, Integer> sortedMap = new LinkedHashMap<String, Integer>();
for (Iterator it = list.iterator(); it.hasNext();) { for (Iterator<Entry<String, Integer>> it = list.iterator(); it.hasNext();) {
Map.Entry entry = (Map.Entry) it.next(); Entry<String, Integer> entry = it.next();
sortedMap.put(entry.getKey(), entry.getValue()); sortedMap.put(entry.getKey(), entry.getValue());
} }
return sortedMap; return sortedMap;