EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Fishing now always gives fish in addition to treasure (configurable)

Browse Source 
Fixing salvage oopsies
This commit is contained in:
nossr50
2019-04-10 04:06:06 -07:00
parent 2170c6de24
commit 75bb3f181d
7 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/config/MainConfig.java
View File

@ -606,10 +606,6 @@ public class MainConfig extends ConfigValidated {
return getBooleanValue(SKILLS, FISHING, OVERRIDE_VANILLA_TREASURES);
}
public boolean getFishingExtraFish() {
return getBooleanValue(SKILLS, FISHING, EXTRA_FISH);
}
public double getFishingLureModifier() {
return getDoubleValue(SKILLS, FISHING, LURE_MODIFIER);
}

10
src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
View File

@ -165,13 +165,6 @@ public class ExperienceConfig extends ConfigValidated {
reason.add(EXPERIENCE + "." + COMBAT + "." + MULTIPLIER + "." + ANIMALS + " should be at least 0!");
}
/* Fishing */
// TODO: Add validation for each fish type once enum is available.
if (getFishingShakeXP() <= 0) {
reason.add(EXPERIENCE + "." + FISHING + "." + SHAKE + " should be greater than 0!");
}
/* Repair */
if (getRepairXPBase() <= 0) {
reason.add(EXPERIENCE + "." + REPAIR + "." + BASE1 + " should be greater than 0!");
@ -374,9 +367,6 @@ public class ExperienceConfig extends ConfigValidated {
return BarStyle.SOLID;
}
public int getFishingShakeXP() {
return getIntValue(EXPERIENCE, FISHING, SHAKE);
}
/* Repair */
public double getRepairXPBase() {

11
src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishing.java
View File

@ -1,8 +1,19 @@
package com.gmail.nossr50.config.hocon.skills.fishing;
import ninja.leaping.configurate.objectmapping.Setting;
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
@ConfigSerializable
public class ConfigFishing {
@Setting(value = "General")
private ConfigFishingGeneral fishingGeneral = new ConfigFishingGeneral();
public ConfigFishingGeneral getFishingGeneral() {
return fishingGeneral;
}
public boolean isAlwaysCatchFish() {
return fishingGeneral.isAlwaysCatchFish();
}
}

18
src/main/java/com/gmail/nossr50/config/hocon/skills/fishing/ConfigFishingGeneral.java Normal file
View File

@ -0,0 +1,18 @@
package com.gmail.nossr50.config.hocon.skills.fishing;
import ninja.leaping.configurate.objectmapping.Setting;
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
@ConfigSerializable
public class ConfigFishingGeneral {
private static final boolean ALWAYS_CATCH_FISH_DEFAULT = true;
@Setting(value = "Always-Catch-Fish", comment = "Enables fish to be caught alongside treasure." +
"\nDefault value: "+ALWAYS_CATCH_FISH_DEFAULT)
private boolean alwaysCatchFish = ALWAYS_CATCH_FISH_DEFAULT;
public boolean isAlwaysCatchFish() {
return alwaysCatchFish;
}
}

4
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -327,7 +327,7 @@ public class FishingManager extends SkillManager {
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE, "Fishing.Ability.TH.MagicFound");
}
if (MainConfig.getInstance().getFishingExtraFish()) {
if (mcMMO.getConfigManager().getConfigFishing().isAlwaysCatchFish()) {
Misc.dropItem(player.getEyeLocation(), fishingCatch.getItemStack());
}
@ -438,7 +438,7 @@ public class FishingManager extends SkillManager {
Misc.dropItem(target.getLocation(), drop);
CombatUtils.dealDamage(target, Math.min(Math.max(target.getMaxHealth() / 4, 1), 10), EntityDamageEvent.DamageCause.CUSTOM, getPlayer()); // Make it so you can shake a mob no more than 4 times.
applyXpGain(ExperienceConfig.getInstance().getFishingShakeXP(), XPGainReason.PVE);
applyXpGain(mcMMO.getConfigManager().getConfigExperience().getShakeXP(), XPGainReason.PVE);
}
}

6
src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
View File

@ -128,13 +128,7 @@ public class SalvageManager extends SkillManager {
Misc.dropItems(location, salvageResults, 1);
// BWONG BWONG BWONG - CLUNK!
<<<<<<< HEAD
if (mcMMO.getConfigManager().getConfigSalvage().getGeneral().isAnvilUseSounds()) {
SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
=======
if (Config.getInstance().getSalvageAnvilUseSoundsEnabled()) {
// SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
>>>>>>> f1204f8a2aa8b402dc84a4b76c46665e02edb767
SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_BREAK);
//player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1.0F, 1.0F);