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

Fixing Bake and Collect word translations

Browse Source
This commit is contained in:
Zrips 2020-01-06 16:01:49 +02:00
parent c3d70a4ccf
commit b54f85a5a3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java
View File

@ -18,6 +18,7 @@ import com.gamingmesh.jobs.CMILib.ConfigReader;
import com.gamingmesh.jobs.container.ActionType; import com.gamingmesh.jobs.container.ActionType;
import com.gamingmesh.jobs.container.JobInfo; import com.gamingmesh.jobs.container.JobInfo;
import com.gamingmesh.jobs.container.NameList; import com.gamingmesh.jobs.container.NameList;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.Util; import com.gamingmesh.jobs.stuff.Util;
public class NameTranslatorManager { public class NameTranslatorManager {
@ -41,6 +42,8 @@ public class NameTranslatorManager {
case EAT: case EAT:
case CRAFT: case CRAFT:
case DYE: case DYE:
case COLLECT:
case BAKE:
case PLACE: case PLACE:
case SMELT: case SMELT:
case REPAIR: case REPAIR:

7
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -26,7 +26,6 @@ import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.actions.*; import com.gamingmesh.jobs.actions.*;
import com.gamingmesh.jobs.api.JobsChunkChangeEvent; import com.gamingmesh.jobs.api.JobsChunkChangeEvent;
import com.gamingmesh.jobs.container.*; import com.gamingmesh.jobs.container.*;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling;
import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling.ownershipFeedback; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling.ownershipFeedback;
import com.google.common.base.Objects; import com.google.common.base.Objects;
@ -40,8 +39,6 @@ import org.bukkit.block.Block;
import org.bukkit.block.BrewingStand; import org.bukkit.block.BrewingStand;
import org.bukkit.block.Furnace; import org.bukkit.block.Furnace;
import org.bukkit.block.data.Ageable; import org.bukkit.block.data.Ageable;
import org.bukkit.block.data.Levelled;
import org.bukkit.block.data.type.Beehive;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Damageable; import org.bukkit.entity.Damageable;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -1600,7 +1597,7 @@ public class JobsPaymentListener implements Listener {
&& event.getAction() == Action.RIGHT_CLICK_BLOCK) { && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (jPlayer != null) { if (jPlayer != null) {
if (cmat.equals(CMIMaterial.COMPOSTER)) { if (cmat.equals(CMIMaterial.COMPOSTER)) {
Levelled level = (Levelled) block.getBlockData(); org.bukkit.block.data.Levelled level = (org.bukkit.block.data.Levelled) block.getBlockData();
if (level.getLevel() == level.getMaximumLevel()) { if (level.getLevel() == level.getMaximumLevel()) {
Jobs.action(jPlayer, new BlockActionInfo(block, ActionType.COLLECT), block); Jobs.action(jPlayer, new BlockActionInfo(block, ActionType.COLLECT), block);
} }
@ -1619,7 +1616,7 @@ public class JobsPaymentListener implements Listener {
&& event.getAction() == Action.RIGHT_CLICK_BLOCK) { && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (jPlayer != null) { if (jPlayer != null) {
if (cmat.equals(CMIMaterial.BEEHIVE) || cmat.equals(CMIMaterial.BEE_NEST)) { if (cmat.equals(CMIMaterial.BEEHIVE) || cmat.equals(CMIMaterial.BEE_NEST)) {
Beehive beehive = (Beehive) block.getBlockData(); org.bukkit.block.data.type.Beehive beehive = (org.bukkit.block.data.type.Beehive) block.getBlockData();
if (beehive.getHoneyLevel() == beehive.getMaximumHoneyLevel() && hand.equals(CMIMaterial.SHEARS.getMaterial()) if (beehive.getHoneyLevel() == beehive.getMaximumHoneyLevel() && hand.equals(CMIMaterial.SHEARS.getMaterial())
|| hand.equals(CMIMaterial.GLASS_BOTTLE.getMaterial())) { || hand.equals(CMIMaterial.GLASS_BOTTLE.getMaterial())) {
Jobs.action(jPlayer, new BlockCollectInfo(block, ActionType.COLLECT, beehive.getHoneyLevel()), block); Jobs.action(jPlayer, new BlockCollectInfo(block, ActionType.COLLECT, beehive.getHoneyLevel()), block);