|
@@ -23,93 +23,28 @@ public class SmeltingManager extends SkillManager {
|
|
super(mcMMOPlayer, PrimarySkillType.SMELTING);
|
|
super(mcMMOPlayer, PrimarySkillType.SMELTING);
|
|
}
|
|
}
|
|
|
|
|
|
- /*public boolean canUseFluxMining(BlockState blockState) {
|
|
|
|
- return getSkillLevel() >= Smelting.fluxMiningUnlockLevel
|
|
|
|
- && BlockUtils.affectedByFluxMining(blockState)
|
|
|
|
- && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SMELTING_FLUX_MINING)
|
|
|
|
- && !mcMMO.getPlaceStore().isTrue(blockState);
|
|
|
|
- }*/
|
|
|
|
-
|
|
|
|
public boolean isSecondSmeltSuccessful() {
|
|
public boolean isSecondSmeltSuccessful() {
|
|
return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SMELTING_SECOND_SMELT)
|
|
return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SMELTING_SECOND_SMELT)
|
|
&& RandomChanceUtil.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.SMELTING_SECOND_SMELT, getPlayer());
|
|
&& RandomChanceUtil.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.SMELTING_SECOND_SMELT, getPlayer());
|
|
}
|
|
}
|
|
|
|
|
|
- /*
|
|
|
|
- Process the Flux Mining ability.
|
|
|
|
-
|
|
|
|
- @param blockState The {@link BlockState} to check ability activation for
|
|
|
|
- * @return true if the ability was successful, false otherwise
|
|
|
|
- */
|
|
|
|
- /*public boolean processFluxMining(BlockState blockState) {
|
|
|
|
- Player player = getPlayer();
|
|
|
|
-
|
|
|
|
- if (RandomChanceUtil.checkRandomChanceExecutionSuccess(getPlayer(), SubSkillType.SMELTING_FLUX_MINING, true)) {
|
|
|
|
- ItemStack item = null;
|
|
|
|
-
|
|
|
|
- switch (blockState.getType()) {
|
|
|
|
- case IRON_ORE:
|
|
|
|
- item = new ItemStack(Material.IRON_INGOT);
|
|
|
|
- break;
|
|
|
|
-
|
|
|
|
- case GOLD_ORE:
|
|
|
|
- item = new ItemStack(Material.GOLD_INGOT);
|
|
|
|
- break;
|
|
|
|
-
|
|
|
|
- default:
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (item == null) {
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (!EventUtils.simulateBlockBreak(blockState.getBlock(), player, true)) {
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- // We need to distribute Mining XP here, because the block break event gets cancelled
|
|
|
|
- applyXpGain(Mining.getBlockXp(blockState), XPGainReason.PVE, XPGainSource.PASSIVE);
|
|
|
|
-
|
|
|
|
- SkillUtils.handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), Config.getInstance().getAbilityToolDamage());
|
|
|
|
-
|
|
|
|
- Misc.dropItems(Misc.getBlockCenter(blockState), item, isSecondSmeltSuccessful() ? 2 : 1);
|
|
|
|
-
|
|
|
|
- blockState.setType(Material.AIR);
|
|
|
|
-
|
|
|
|
- if (Config.getInstance().getFluxPickaxeSoundEnabled()) {
|
|
|
|
- SoundManager.sendSound(player, blockState.getLocation(), SoundType.FIZZ);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- ParticleEffectUtils.playFluxEffect(blockState.getLocation());
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- return false;
|
|
|
|
- }*/
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* Increases burn time for furnace fuel.
|
|
* Increases burn time for furnace fuel.
|
|
*
|
|
*
|
|
* @param burnTime The initial burn time from the {@link FurnaceBurnEvent}
|
|
* @param burnTime The initial burn time from the {@link FurnaceBurnEvent}
|
|
*/
|
|
*/
|
|
public int fuelEfficiency(int burnTime) {
|
|
public int fuelEfficiency(int burnTime) {
|
|
- return burnTime * getFuelEfficiencyMultiplier();
|
|
|
|
|
|
+ return Math.max(1, burnTime * getFuelEfficiencyMultiplier());
|
|
}
|
|
}
|
|
|
|
|
|
public int getFuelEfficiencyMultiplier()
|
|
public int getFuelEfficiencyMultiplier()
|
|
{
|
|
{
|
|
- switch(RankUtils.getRank(getPlayer(), SubSkillType.SMELTING_FUEL_EFFICIENCY))
|
|
|
|
- {
|
|
|
|
- case 1:
|
|
|
|
- return 2;
|
|
|
|
- case 2:
|
|
|
|
- return 3;
|
|
|
|
- case 3:
|
|
|
|
- return 4;
|
|
|
|
- default:
|
|
|
|
- return 1;
|
|
|
|
- }
|
|
|
|
|
|
+ return switch (RankUtils.getRank(getPlayer(), SubSkillType.SMELTING_FUEL_EFFICIENCY)) {
|
|
|
|
+ case 1 -> 2;
|
|
|
|
+ case 2 -> 3;
|
|
|
|
+ case 3 -> 4;
|
|
|
|
+ default -> 1;
|
|
|
|
+ };
|
|
}
|
|
}
|
|
|
|
|
|
public void smeltProcessing(@NotNull FurnaceSmeltEvent furnaceSmeltEvent, @NotNull Furnace furnace) {
|
|
public void smeltProcessing(@NotNull FurnaceSmeltEvent furnaceSmeltEvent, @NotNull Furnace furnace) {
|