From b54f85a5a3b00bec47ccc04d15c3060571712cea Mon Sep 17 00:00:00 2001 From: Zrips Date: Mon, 6 Jan 2020 16:01:49 +0200 Subject: [PATCH] Fixing Bake and Collect word translations --- .../com/gamingmesh/jobs/config/NameTranslatorManager.java | 3 +++ .../com/gamingmesh/jobs/listeners/JobsPaymentListener.java | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java b/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java index e509eca7..483ffa67 100644 --- a/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java @@ -18,6 +18,7 @@ import com.gamingmesh.jobs.CMILib.ConfigReader; import com.gamingmesh.jobs.container.ActionType; import com.gamingmesh.jobs.container.JobInfo; import com.gamingmesh.jobs.container.NameList; +import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.Util; public class NameTranslatorManager { @@ -41,6 +42,8 @@ public class NameTranslatorManager { case EAT: case CRAFT: case DYE: + case COLLECT: + case BAKE: case PLACE: case SMELT: case REPAIR: diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java index 33c604c2..802cffc1 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java @@ -26,7 +26,6 @@ import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.actions.*; import com.gamingmesh.jobs.api.JobsChunkChangeEvent; import com.gamingmesh.jobs.container.*; -import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling; import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling.ownershipFeedback; import com.google.common.base.Objects; @@ -40,8 +39,6 @@ import org.bukkit.block.Block; import org.bukkit.block.BrewingStand; import org.bukkit.block.Furnace; 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.entity.Damageable; import org.bukkit.entity.Entity; @@ -1600,7 +1597,7 @@ public class JobsPaymentListener implements Listener { && event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (jPlayer != null) { 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()) { Jobs.action(jPlayer, new BlockActionInfo(block, ActionType.COLLECT), block); } @@ -1619,7 +1616,7 @@ public class JobsPaymentListener implements Listener { && event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (jPlayer != null) { 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()) || hand.equals(CMIMaterial.GLASS_BOTTLE.getMaterial())) { Jobs.action(jPlayer, new BlockCollectInfo(block, ActionType.COLLECT, beehive.getHoneyLevel()), block);