EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 12:35:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO into endgame

Browse Source
This commit is contained in:
nossr50
2021-02-26 16:22:11 -08:00
parent f039b4cbfa 713b0619c3
commit 1a180c4cdf
18 changed files with 691 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@@ -179,8 +179,10 @@ public class HerbalismManager extends SkillManager {
//TODO: The design of Green Terra needs to change, this is a mess
if(Permissions.greenThumbPlant(getPlayer(), originalBreak.getType())) {
if(!getPlayer().isSneaking()) {
greenThumbActivated = processGreenThumbPlants(originalBreak, blockBreakEvent, isGreenTerraActive());
if(Config.getInstance().isGreenThumbReplantableCrop(originalBreak.getType())) {
if(!getPlayer().isSneaking()) {
greenThumbActivated = processGreenThumbPlants(originalBreak, blockBreakEvent, isGreenTerraActive());
}
}
}
@@ -685,7 +687,7 @@ public class HerbalismManager extends SkillManager {
*/
private boolean processGreenThumbPlants(BlockState blockState, BlockBreakEvent blockBreakEvent, boolean greenTerra) {
if (!ItemUtils.isHoe(blockBreakEvent.getPlayer().getInventory().getItemInMainHand())
&& !ItemUtils.isAxe(blockBreakEvent.getPlayer().getInventory().getItemInMainHand())) {
&& !ItemUtils.isAxe(blockBreakEvent.getPlayer().getInventory().getItemInMainHand())) {
return false;
}

30
src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
View File

@@ -11,7 +11,9 @@ import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillUtils;
import org.bukkit.event.inventory.FurnaceBurnEvent;
import org.bukkit.event.inventory.FurnaceSmeltEvent;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
public class SmeltingManager extends SkillManager {
public SmeltingManager(McMMOPlayer mcMMOPlayer) {
@@ -107,19 +109,29 @@ public class SmeltingManager extends SkillManager {
}
}
public ItemStack smeltProcessing(ItemStack smelting, ItemStack result) {
public void smeltProcessing(@NotNull FurnaceSmeltEvent furnaceSmeltEvent) {
ItemStack sourceItemStack = furnaceSmeltEvent.getSource();
ItemStack resultItemStack = furnaceSmeltEvent.getResult();
applyXpGain(Smelting.getResourceXp(smelting), XPGainReason.PVE, XPGainSource.PASSIVE);
applyXpGain(Smelting.getResourceXp(sourceItemStack), XPGainReason.PVE, XPGainSource.PASSIVE); //Add XP
int itemLimit = resultItemStack.getMaxStackSize();
if (Config.getInstance().getDoubleDropsEnabled(PrimarySkillType.SMELTING, result.getType())
&& isSecondSmeltSuccessful() && result.getAmount() < 64) {
ItemStack newResult = result.clone();
processDoubleSmelt(furnaceSmeltEvent, resultItemStack, itemLimit);
}
newResult.setAmount(result.getAmount() + 1);
return newResult;
private void processDoubleSmelt(@NotNull FurnaceSmeltEvent furnaceSmeltEvent, @NotNull ItemStack resultItemStack, int itemLimit) {
//TODO: Permission check work around, could store it as NBT on the furnace
//We don't do permission checks because this can be for an offline player and Bukkit has nothing to grab permissions for offline players
//Process double smelt
if (Config.getInstance().getDoubleDropsEnabled(PrimarySkillType.SMELTING, resultItemStack.getType())
&& resultItemStack.getAmount() < itemLimit
&& isSecondSmeltSuccessful()) {
ItemStack newResult = resultItemStack.clone();
newResult.setAmount(Math.min(resultItemStack.getAmount() + 1, itemLimit)); //Don't go over max stack limits
furnaceSmeltEvent.setResult(newResult);
}
return result;
}
public int vanillaXPBoost(int experience) {