Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-15 07:05:51 +01:00
Code Issues Projects Releases Wiki Activity

Retain objective data order, fixes #242

Browse Source
This commit is contained in:
HappyPikachu 2018-01-16 03:05:45 -05:00
parent 861eb41852
commit 01cad69706
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/me/blackvein/quests/QuestData.java
View File

@ -13,8 +13,7 @@
package me.blackvein.quests;
import java.util.Collection;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
@ -81,6 +80,7 @@ public class QuestData {
return i;
}
};
public LinkedList<ItemStack> blocksBroken = new LinkedList<ItemStack>() {
private static final long serialVersionUID = -6071822509475270168L;
@ -124,6 +124,7 @@ public class QuestData {
return i;
}
};
public LinkedList<ItemStack> blocksPlaced = new LinkedList<ItemStack>() {
private static final long serialVersionUID = 4226366446050903433L;
@ -167,6 +168,7 @@ public class QuestData {
return i;
}
};
public LinkedList<ItemStack> blocksUsed = new LinkedList<ItemStack>() {
private static final long serialVersionUID = -9057864863810306890L;
@ -210,6 +212,7 @@ public class QuestData {
return i;
}
};
public LinkedList<ItemStack> blocksCut = new LinkedList<ItemStack>() {
private static final long serialVersionUID = -8204359763290995080L;
@ -253,7 +256,8 @@ public class QuestData {
return i;
}
};
public Map<String, Integer> potionsBrewed = new HashMap<String, Integer>() {
public LinkedHashMap<String, Integer> potionsBrewed = new LinkedHashMap<String, Integer>() {
private static final long serialVersionUID = 5079308756224324031L;
@ -287,7 +291,8 @@ public class QuestData {
quester.updateJournal();
}
};
public Map<ItemStack, Integer> itemsDelivered = new HashMap<ItemStack, Integer>() {
public LinkedHashMap<ItemStack, Integer> itemsDelivered = new LinkedHashMap<ItemStack, Integer>() {
private static final long serialVersionUID = 2712497347022734646L;
@ -321,7 +326,8 @@ public class QuestData {
quester.updateJournal();
}
};
public Map<Map<Enchantment, Material>, Integer> itemsEnchanted = new HashMap<Map<Enchantment, Material>, Integer>() {
public LinkedHashMap<Map<Enchantment, Material>, Integer> itemsEnchanted = new LinkedHashMap<Map<Enchantment, Material>, Integer>() {
private static final long serialVersionUID = 416869352279205852L;
@ -355,6 +361,7 @@ public class QuestData {
quester.updateJournal();
}
};
public LinkedList<EntityType> mobsKilled = new LinkedList<EntityType>() {
private static final long serialVersionUID = 8178007458817522183L;
@ -421,6 +428,7 @@ public class QuestData {
return s;
}
};
public LinkedList<Integer> mobNumKilled = new LinkedList<Integer>() {
private static final long serialVersionUID = 2228385647091499176L;
@ -487,6 +495,7 @@ public class QuestData {
return s;
}
};
public LinkedList<Location> locationsToKillWithin = new LinkedList<Location>() {
private static final long serialVersionUID = 557285564460615021L;
@ -553,6 +562,7 @@ public class QuestData {
return s;
}
};
public LinkedList<Integer> radiiToKillWithin = new LinkedList<Integer>() {
private static final long serialVersionUID = 1973115869697752181L;
@ -619,7 +629,8 @@ public class QuestData {
return s;
}
};
public Map<Integer, Boolean> citizensInteracted = new HashMap<Integer, Boolean>() {
public LinkedHashMap<Integer, Boolean> citizensInteracted = new LinkedHashMap<Integer, Boolean>() {
private static final long serialVersionUID = 2447610341508300847L;
@ -653,6 +664,7 @@ public class QuestData {
quester.updateJournal();
}
};
public LinkedList<Integer> citizensKilled = new LinkedList<Integer>() {
private static final long serialVersionUID = -6054581494356961482L;
@ -719,6 +731,7 @@ public class QuestData {
return s;
}
};
public LinkedList<Integer> citizenNumKilled = new LinkedList<Integer>() {
private static final long serialVersionUID = 1849192351499071688L;
@ -785,6 +798,7 @@ public class QuestData {
return s;
}
};
public LinkedList<Location> locationsReached = new LinkedList<Location>() {
private static final long serialVersionUID = 2875034788869133862L;
@ -851,6 +865,7 @@ public class QuestData {
return s;
}
};
public LinkedList<Boolean> hasReached = new LinkedList<Boolean>() {
private static final long serialVersionUID = -8802305642082466541L;
@ -917,6 +932,7 @@ public class QuestData {
return s;
}
};
public LinkedList<Integer> radiiToReachWithin = new LinkedList<Integer>() {
private static final long serialVersionUID = 6027656509740406846L;
@ -983,7 +999,9 @@ public class QuestData {
return s;
}
};
public Map<EntityType, Integer> mobsTamed = new EnumMap<EntityType, Integer>(EntityType.class) {
//public Map<EntityType, Integer> mobsTamed = new EnumMap<EntityType, Integer>(EntityType.class) {
public LinkedHashMap<EntityType, Integer> mobsTamed = new LinkedHashMap<EntityType, Integer>() {
private static final long serialVersionUID = 3851959471748032699L;
@ -1017,7 +1035,9 @@ public class QuestData {
quester.updateJournal();
}
};
public Map<DyeColor, Integer> sheepSheared = new EnumMap<DyeColor, Integer>(DyeColor.class) {
//public Map<DyeColor, Integer> sheepSheared = new EnumMap<DyeColor, Integer>(DyeColor.class) {
public LinkedHashMap<DyeColor, Integer> sheepSheared = new LinkedHashMap<DyeColor, Integer>() {
private static final long serialVersionUID = -6016463677133534885L;
@ -1051,7 +1071,8 @@ public class QuestData {
quester.updateJournal();
}
};
public Map<String, Boolean> passwordsSaid = new HashMap<String, Boolean>() {
public LinkedHashMap<String, Boolean> passwordsSaid = new LinkedHashMap<String, Boolean>() {
private static final long serialVersionUID = -4297290041298491402L;
@ -1085,7 +1106,8 @@ public class QuestData {
quester.updateJournal();
}
};
public Map<String, Integer> customObjectiveCounts = new HashMap<String, Integer>() {
public LinkedHashMap<String, Integer> customObjectiveCounts = new LinkedHashMap<String, Integer>() {
private static final long serialVersionUID = -2148775183072606256L;
@ -1119,7 +1141,8 @@ public class QuestData {
quester.updateJournal();
}
};
public Map<String, Boolean> eventFired = new HashMap<String, Boolean>() {
public LinkedHashMap<String, Boolean> eventFired = new LinkedHashMap<String, Boolean>() {
private static final long serialVersionUID = 7106048037834965123L;
@ -1153,6 +1176,7 @@ public class QuestData {
quester.updateJournal();
}
};
private int fishCaught = 0;
private int playersKilled = 0;
public long delayStartTime = 0;
@ -1178,4 +1202,4 @@ public class QuestData {
public int getPlayersKilled() {
return playersKilled;
}
}
}