Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-03 06:01:44 +01:00
Code Issues Projects Releases Wiki Activity

Adjust variable name

Browse Source
This commit is contained in:
PikaMug 2020-07-14 16:13:56 -04:00
parent f177b652ac
commit 2962b6ff79
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/me/blackvein/quests/conditions/ConditionFactory.java
View File

@ -83,7 +83,7 @@ public class ConditionFactory implements ConversationAbandonedListener {
&& condition.getItemsWhileHoldingMainHand().isEmpty() == false) { && condition.getItemsWhileHoldingMainHand().isEmpty() == false) {
LinkedList<ItemStack> items = new LinkedList<ItemStack>(); LinkedList<ItemStack> items = new LinkedList<ItemStack>();
items.addAll(condition.getItemsWhileHoldingMainHand()); items.addAll(condition.getItemsWhileHoldingMainHand());
context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, items); context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, items);
} }
} }
@ -91,7 +91,7 @@ public class ConditionFactory implements ConversationAbandonedListener {
context.setSessionData(CK.C_OLD_CONDITION, null); context.setSessionData(CK.C_OLD_CONDITION, null);
context.setSessionData(CK.C_NAME, null); context.setSessionData(CK.C_NAME, null);
context.setSessionData(CK.C_FAIL_QUEST, null); context.setSessionData(CK.C_FAIL_QUEST, null);
context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, null); context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, null);
} }
public void deleteCondition(ConversationContext context) { public void deleteCondition(ConversationContext context) {
@ -167,9 +167,9 @@ public class ConditionFactory implements ConversationAbandonedListener {
section.set("fail-quest", true); section.set("fail-quest", true);
} }
} }
if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) != null) { if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) != null) {
section.set("hold-main-hand", section.set("hold-main-hand",
(LinkedList<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND)); (LinkedList<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND));
} }
try { try {
data.save(conditionsFile); data.save(conditionsFile);

24
main/src/main/java/me/blackvein/quests/convo/conditions/tasks/PlayerPrompt.java
View File

@ -70,11 +70,11 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
public String getAdditionalText(ConversationContext context, int number) { public String getAdditionalText(ConversationContext context, int number) {
switch(number) { switch(number) {
case 1: case 1:
if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) == null) { if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) == null) {
return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")"; return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")";
} else { } else {
String text = "\n"; String text = "\n";
LinkedList<ItemStack> items = (LinkedList<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND); LinkedList<ItemStack> items = (LinkedList<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND);
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
text += ChatColor.GRAY + " - " + ChatColor.BLUE + ItemUtil.getName(items.get(i)) text += ChatColor.GRAY + " - " + ChatColor.BLUE + ItemUtil.getName(items.get(i))
+ ChatColor.GRAY + " x " + ChatColor.AQUA + items.get(i).getAmount() + "\n"; + ChatColor.GRAY + " x " + ChatColor.AQUA + items.get(i).getAmount() + "\n";
@ -93,10 +93,10 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
// Check/add newly made item // Check/add newly made item
if (context.getSessionData("newItem") != null) { if (context.getSessionData("newItem") != null) {
if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) != null) { if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) != null) {
List<ItemStack> items = (List<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND); List<ItemStack> items = (List<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND);
items.add((ItemStack) context.getSessionData("tempStack")); items.add((ItemStack) context.getSessionData("tempStack"));
context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, items); context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, items);
} }
context.setSessionData("newItem", null); context.setSessionData("newItem", null);
context.setSessionData("tempStack", null); context.setSessionData("tempStack", null);
@ -176,11 +176,11 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
public String getAdditionalText(ConversationContext context, int number) { public String getAdditionalText(ConversationContext context, int number) {
switch(number) { switch(number) {
case 1: case 1:
if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) == null) { if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) == null) {
return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")"; return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")";
} else { } else {
String text = "\n"; String text = "\n";
for (ItemStack is : (List<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND)) { for (ItemStack is : (List<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND)) {
text += ChatColor.GRAY + " - " + ItemUtil.getDisplayString(is) + "\n"; text += ChatColor.GRAY + " - " + ItemUtil.getDisplayString(is) + "\n";
} }
return text; return text;
@ -198,14 +198,14 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
// Check/add newly made item // Check/add newly made item
if (context.getSessionData("newItem") != null) { if (context.getSessionData("newItem") != null) {
if (context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND) != null) { if (context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND) != null) {
List<ItemStack> items = (List<ItemStack>) context.getSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND); List<ItemStack> items = (List<ItemStack>) context.getSessionData(CK.C_WHILE_HOLDING_MAIN_HAND);
items.add((ItemStack) context.getSessionData("tempStack")); items.add((ItemStack) context.getSessionData("tempStack"));
context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, items); context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, items);
} else { } else {
LinkedList<ItemStack> items = new LinkedList<ItemStack>(); LinkedList<ItemStack> items = new LinkedList<ItemStack>();
items.add((ItemStack) context.getSessionData("tempStack")); items.add((ItemStack) context.getSessionData("tempStack"));
context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, items); context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, items);
} }
context.setSessionData("newItem", null); context.setSessionData("newItem", null);
context.setSessionData("tempStack", null); context.setSessionData("tempStack", null);
@ -229,7 +229,7 @@ public class PlayerPrompt extends QuestsEditorNumericPrompt {
return new ItemStackPrompt(ItemsInMainHandListPrompt.this); return new ItemStackPrompt(ItemsInMainHandListPrompt.this);
case 2: case 2:
context.getForWhom().sendRawMessage(ChatColor.YELLOW + Lang.get("conditionEditorConditionCleared")); context.getForWhom().sendRawMessage(ChatColor.YELLOW + Lang.get("conditionEditorConditionCleared"));
context.setSessionData(CK.C_ITEMS_WHILE_HOLDING_MAIN_HAND, null); context.setSessionData(CK.C_WHILE_HOLDING_MAIN_HAND, null);
return new ItemsInMainHandListPrompt(context); return new ItemsInMainHandListPrompt(context);
case 3: case 3:
return new PlayerPrompt(context); return new PlayerPrompt(context);

2
main/src/main/java/me/blackvein/quests/util/CK.java
View File

@ -177,5 +177,5 @@ public class CK {
public static final String C_OLD_CONDITION = "oldCondition"; public static final String C_OLD_CONDITION = "oldCondition";
public static final String C_NAME = "conName"; public static final String C_NAME = "conName";
public static final String C_FAIL_QUEST = "conFailQuest"; public static final String C_FAIL_QUEST = "conFailQuest";
public static final String C_ITEMS_WHILE_HOLDING_MAIN_HAND = "conItemsMainHand"; public static final String C_WHILE_HOLDING_MAIN_HAND = "conHoldingMainHand";
} }