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

merge master

Browse Source
This commit is contained in:
nossr50
2023-04-03 12:12:17 -07:00
parent 6845fb4c44 7264e1a8d6
commit 68d4a179f1
18 changed files with 188 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,10 +40,7 @@ import org.bukkit.inventory.PlayerInventory;
import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.*;
public class HerbalismManager extends SkillManager {
public HerbalismManager(McMMOPlayer mcMMOPlayer) {
@@ -771,35 +768,39 @@ public class HerbalismManager extends SkillManager {
PlayerInventory playerInventory = player.getInventory();
Material seed;
switch (blockState.getType()) {
case CARROTS:
seed = Material.CARROT;
switch (blockState.getType().getKey().getKey().toLowerCase(Locale.ROOT)) {
case "carrots":
seed = Material.matchMaterial("CARROT");
break;
case WHEAT:
seed = Material.WHEAT_SEEDS;
case "wheat":
seed = Material.matchMaterial("WHEAT_SEEDS");
break;
case NETHER_WART:
seed = Material.NETHER_WART;
case "nether_wart":
seed = Material.getMaterial("NETHER_WART");
break;
case POTATOES:
seed = Material.POTATO;
case "potatoes":
seed = Material.matchMaterial("POTATO");
break;
case BEETROOTS:
seed = Material.BEETROOT_SEEDS;
case "beetroots":
seed = Material.matchMaterial("BEETROOT_SEEDS");
break;
case COCOA:
seed = Material.COCOA_BEANS;
case "cocoa":
seed = Material.matchMaterial("COCOA_BEANS");
break;
case "torchflower":
seed = Material.matchMaterial("TORCHFLOWER_SEEDS");
break;
default:
return false;
}
ItemStack seedStack = new ItemStack(seed);
if (ItemUtils.isAxe(blockBreakEvent.getPlayer().getInventory().getItemInMainHand())
@@ -850,17 +851,17 @@ public class HerbalismManager extends SkillManager {
return true;
}
switch (blockState.getType()) {
switch (blockState.getType().getKey().getKey()) {
case POTATOES:
case CARROTS:
case WHEAT:
case "potatoes":
case "carrots":
case "wheat":
finalAge = getGreenThumbStage(greenTerra);
break;
case BEETROOTS:
case NETHER_WART:
case "beetroots":
case "nether_wart":
if (greenTerra || greenThumbStage > 2) {
finalAge = 2;
@@ -871,9 +872,9 @@ public class HerbalismManager extends SkillManager {
else {
finalAge = 0;
}
break;
break;
case COCOA:
case "cocoa":
if (getGreenThumbStage(greenTerra) >= 2) {
finalAge = 1;
@@ -887,6 +888,7 @@ public class HerbalismManager extends SkillManager {
return false;
}
//Start the delayed replant
startReplantTask(finalAge, blockBreakEvent, blockState, false);
return true;

26
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@@ -1,6 +1,7 @@
package com.gmail.nossr50.skills.mining;
import com.gmail.nossr50.api.ItemSpawnReason;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
@@ -216,7 +217,7 @@ public class MiningManager extends SkillManager {
Misc.spawnItem(getPlayer(), Misc.getBlockCenter(blockState), new ItemStack(blockState.getType()), ItemSpawnReason.BLAST_MINING_ORES); // Initial block that would have been dropped
if (!mcMMO.getPlaceStore().isTrue(blockState)) {
if (mcMMO.p.getAdvancedConfig().isBlastMiningBonusDropsEnabled() && !mcMMO.getPlaceStore().isTrue(blockState)) {
for (int i = 1; i < dropMultiplier; i++) {
// Bukkit.broadcastMessage("Bonus Drop on Ore: "+blockState.getType().toString());
Misc.spawnItem(getPlayer(), Misc.getBlockCenter(blockState), new ItemStack(blockState.getType()), ItemSpawnReason.BLAST_MINING_ORES_BONUS_DROP); // Initial block that would have been dropped
@@ -303,21 +304,16 @@ public class MiningManager extends SkillManager {
* @return the Blast Mining tier
*/
public int getDropMultiplier() {
switch(getBlastMiningTier()) {
case 8:
case 7:
return 3;
case 6:
case 5:
case 4:
case 3:
return 2;
case 2:
case 1:
return 1;
default:
return 0;
if (mcMMO.p.getAdvancedConfig().isBlastMiningBonusDropsEnabled()) {
return 0;
}
return switch (getBlastMiningTier()) {
case 8, 7 -> 3;
case 6, 5, 4, 3 -> 2;
case 2, 1 -> 1;
default -> 0;
};
}
/**