mirror of
https://github.com/BentoBoxWorld/Challenges.git
synced 2024-12-30 21:07:47 +01:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
12dd740959
@ -1,5 +1,5 @@
|
|||||||
Thanks for submitting a pull request. Do not use this form for bug reports!
|
Thanks for submitting a pull request. Do not use this form for bug reports!
|
||||||
Your submission must meet the minimum requirements of a contribution, i.e., add code, refactor code or fix code.
|
Your submission must meet the minimum requirements of a contribution, i.e., add code, refactor code or fix code.
|
||||||
It takes time and effort to review submissions, so please do not waste our time.
|
It takes time and effort to review submissions, so please do not waste our time.
|
||||||
Note: formating/spacing-only submissions will be rejected!
|
Note: formatting/spacing-only submissions will be rejected!
|
||||||
For submissions, we want you to use spaces, not tabs (4 spaces) - thank you.
|
For submissions, we want you to use spaces, not tabs (4 spaces) - thank you.
|
||||||
|
@ -85,7 +85,7 @@ public class CompleteCommand extends CompositeCommand
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.addon.logError("Unknonw player name " + args.get(0));
|
this.addon.logError("Unknown player name " + args.get(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -83,7 +83,7 @@ public class ResetCommand extends CompositeCommand
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.addon.logError("Unknonw player name " + args.get(0));
|
this.addon.logError("Unknown player name " + args.get(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -157,7 +157,7 @@ public class ListUsersGUI extends CommonGUI
|
|||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add button that allows to toogle different player lists.
|
// Add button that allows to toggle different player lists.
|
||||||
panelBuilder.item( 4, this.createToggleButton());
|
panelBuilder.item( 4, this.createToggleButton());
|
||||||
|
|
||||||
// Navigation buttons only if necessary
|
// Navigation buttons only if necessary
|
||||||
|
@ -273,7 +273,7 @@
|
|||||||
"friendlyName": "Cobble Stone Exchange",
|
"friendlyName": "Cobble Stone Exchange",
|
||||||
"deployed": true,
|
"deployed": true,
|
||||||
"description": [
|
"description": [
|
||||||
"Exchange cobble to some useful materials"
|
"Exchange cobble stone to some useful materials"
|
||||||
],
|
],
|
||||||
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: COBBLESTONE\n",
|
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: COBBLESTONE\n",
|
||||||
"order": 1,
|
"order": 1,
|
||||||
@ -1398,7 +1398,7 @@
|
|||||||
"takeMoney": false,
|
"takeMoney": false,
|
||||||
"requiredIslandLevel": 0,
|
"requiredIslandLevel": 0,
|
||||||
"searchRadius": 20,
|
"searchRadius": 20,
|
||||||
"rewardText": "Some diaond and elytra for your efforts.",
|
"rewardText": "Some diamonds and elytra for your efforts.",
|
||||||
"rewardItems": [
|
"rewardItems": [
|
||||||
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: DIAMOND_ORE\n amount: 16\n",
|
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: DIAMOND_ORE\n amount: 16\n",
|
||||||
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: ELYTRA\n"
|
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: ELYTRA\n"
|
||||||
@ -2245,7 +2245,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"uniqueId": "competent",
|
"uniqueId": "competent",
|
||||||
"friendlyName": "Compenent Island",
|
"friendlyName": "Competent Island",
|
||||||
"deployed": true,
|
"deployed": true,
|
||||||
"description": [
|
"description": [
|
||||||
"Reach 20th level of island."
|
"Reach 20th level of island."
|
||||||
@ -2431,7 +2431,7 @@
|
|||||||
"friendlyName": "Hostile Zoo",
|
"friendlyName": "Hostile Zoo",
|
||||||
"deployed": true,
|
"deployed": true,
|
||||||
"description": [
|
"description": [
|
||||||
"Create hostime mob zoo"
|
"Create hostile mob zoo"
|
||||||
],
|
],
|
||||||
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: IRON_BARS\n",
|
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: IRON_BARS\n",
|
||||||
"order": 6,
|
"order": 6,
|
||||||
@ -2486,8 +2486,8 @@
|
|||||||
"repeatRewardCommands": []
|
"repeatRewardCommands": []
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"uniqueId": "cheff",
|
"uniqueId": "chef",
|
||||||
"friendlyName": "Cheff",
|
"friendlyName": "Chef",
|
||||||
"deployed": true,
|
"deployed": true,
|
||||||
"description": [
|
"description": [
|
||||||
"Show your ability to cook all types of food"
|
"Show your ability to cook all types of food"
|
||||||
@ -2551,7 +2551,7 @@
|
|||||||
"friendlyName": "Zoo Maker",
|
"friendlyName": "Zoo Maker",
|
||||||
"deployed": true,
|
"deployed": true,
|
||||||
"description": [
|
"description": [
|
||||||
"Create a peacefull mob zoo"
|
"Create a peaceful mob zoo"
|
||||||
],
|
],
|
||||||
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: GLASS_PANE\n",
|
"icon": "is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: GLASS_PANE\n",
|
||||||
"order": 7,
|
"order": 7,
|
||||||
@ -2787,8 +2787,8 @@
|
|||||||
"world": "",
|
"world": "",
|
||||||
"order": 2,
|
"order": 2,
|
||||||
"waiverAmount": 2,
|
"waiverAmount": 2,
|
||||||
"unlockMessage": "Congratulations - you unlocked the &dComponent level!",
|
"unlockMessage": "Congratulations - you unlocked the &dCompetent level!",
|
||||||
"rewardText": "Small reward for completing all Component challenges.",
|
"rewardText": "Small reward for completing all Competent challenges.",
|
||||||
"rewardItems": [
|
"rewardItems": [
|
||||||
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: DIRT\n amount: 16\n"
|
"is:\n ==: org.bukkit.inventory.ItemStack\n v: 1631\n type: DIRT\n amount: 16\n"
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user