Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-01 15:03:36 +01:00
Code Issues Projects Releases Wiki Activity

Rename cook to bake

Browse Source 
Correct English
This commit is contained in:
montlikadani 2019-10-26 11:37:40 +02:00
parent c36df666be
commit c825a2de56
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java
View File

@ -416,6 +416,7 @@ public class editjobs implements Cmd {
case ENCHANT: case ENCHANT:
case DYE: case DYE:
case CRAFT: case CRAFT:
case BAKE:
case BREW: case BREW:
case BREAK: case BREAK:
case STRIPLOGS: case STRIPLOGS:
@ -559,7 +560,7 @@ public class editjobs implements Cmd {
} }
type = myKey; type = myKey;
} else if (actionT == ActionType.CUSTOMKILL || actionT == ActionType.SHEAR || actionT == ActionType.MMKILL } else if (actionT == ActionType.CUSTOMKILL || actionT == ActionType.SHEAR || actionT == ActionType.MMKILL
|| actionT == ActionType.COLLECT) || actionT == ActionType.COLLECT || actionT == ActionType.BAKE)
type = myKey; type = myKey;
else if (actionT == ActionType.EXPLORE) { else if (actionT == ActionType.EXPLORE) {
type = myKey; type = myKey;

3
src/main/java/com/gamingmesh/jobs/commands/list/editquests.java
View File

@ -369,6 +369,7 @@ public class editquests implements Cmd {
case ENCHANT: case ENCHANT:
case DYE: case DYE:
case CRAFT: case CRAFT:
case BAKE:
case BREW: case BREW:
case BREAK: case BREAK:
case STRIPLOGS: case STRIPLOGS:
@ -513,7 +514,7 @@ public class editquests implements Cmd {
} }
type = myKey; type = myKey;
} else if (actionT == ActionType.CUSTOMKILL || actionT == ActionType.SHEAR || actionT == ActionType.MMKILL } else if (actionT == ActionType.CUSTOMKILL || actionT == ActionType.SHEAR || actionT == ActionType.MMKILL
|| actionT == ActionType.COLLECT) || actionT == ActionType.COLLECT || actionT == ActionType.BAKE)
type = myKey; type = myKey;
else if (actionT == ActionType.EXPLORE) { else if (actionT == ActionType.EXPLORE) {
type = myKey; type = myKey;

8
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -201,7 +201,7 @@ public class ConfigManager {
case ENCHANT: case ENCHANT:
case DYE: case DYE:
case CRAFT: case CRAFT:
case COOK: case BAKE:
case BREW: case BREW:
case BREAK: case BREAK:
case STRIPLOGS: case STRIPLOGS:
@ -351,7 +351,7 @@ public class ConfigManager {
CMIEnchantment enchant = CMIEnchantment.get(myKey); CMIEnchantment enchant = CMIEnchantment.get(myKey);
type = enchant == null ? myKey : enchant.toString(); type = enchant == null ? myKey : enchant.toString();
} else if (actionType == ActionType.CUSTOMKILL || actionType == ActionType.SHEAR || actionType == ActionType.MMKILL } else if (actionType == ActionType.CUSTOMKILL || actionType == ActionType.SHEAR || actionType == ActionType.MMKILL
|| actionType == ActionType.COLLECT || actionType == ActionType.COOK) || actionType == ActionType.COLLECT || actionType == ActionType.BAKE)
type = myKey; type = myKey;
else if (actionType == ActionType.EXPLORE) { else if (actionType == ActionType.EXPLORE) {
type = myKey; type = myKey;
@ -987,7 +987,7 @@ public class ConfigManager {
case ENCHANT: case ENCHANT:
case DYE: case DYE:
case CRAFT: case CRAFT:
case COOK: case BAKE:
case BREW: case BREW:
case BREAK: case BREAK:
case STRIPLOGS: case STRIPLOGS:
@ -1139,7 +1139,7 @@ public class ConfigManager {
} }
type = enchant == null ? myKey : enchant.toString(); type = enchant == null ? myKey : enchant.toString();
} else if (actionType == ActionType.CUSTOMKILL || actionType == ActionType.COLLECT || actionType == ActionType.MMKILL } else if (actionType == ActionType.CUSTOMKILL || actionType == ActionType.COLLECT || actionType == ActionType.MMKILL
|| actionType == ActionType.SHEAR || actionType == ActionType.COOK) || actionType == ActionType.SHEAR || actionType == ActionType.BAKE)
type = myKey; type = myKey;
else if (actionType == ActionType.EXPLORE) { else if (actionType == ActionType.EXPLORE) {
type = myKey; type = myKey;

2
src/main/java/com/gamingmesh/jobs/container/ActionType.java
View File

@ -41,7 +41,7 @@ public enum ActionType {
EAT("Eat"), EAT("Eat"),
CUSTOMKILL("custom-kill"), CUSTOMKILL("custom-kill"),
COLLECT("Collect"), COLLECT("Collect"),
COOK("Cook"); BAKE("Bake");
private String name; private String name;

2
src/main/java/com/gamingmesh/jobs/listeners/JobsPayment14Listener.java
View File

@ -50,7 +50,7 @@ public class JobsPayment14Listener implements Listener {
if (jPlayer == null) if (jPlayer == null)
return; return;
Jobs.action(jPlayer, new ItemActionInfo(event.getResult(), ActionType.COOK)); Jobs.action(jPlayer, new ItemActionInfo(event.getResult(), ActionType.BAKE));
it.remove(); it.remove();
} }
} }

2
src/main/resources/jobConfig.yml
View File

@ -234,7 +234,7 @@ Jobs:
points: 1.5 points: 1.5
experience: 1.5 experience: 1.5
# Payment for cooking raw foods # Payment for cooking raw foods
Cook: Bake:
beef: beef:
income: 1.0 income: 1.0
experience: 1.0 experience: 1.0