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

Refactoring to make my life easier

Browse Source
This commit is contained in:
nossr50
2018-12-29 05:24:55 -08:00
parent 35368db05d
commit 0d260a74c9
126 changed files with 1471 additions and 1408 deletions
Changelog.txtpom.xml
src/main
java
com
gmail
nossr50
api
AbilityAPI.javaExperienceAPI.javaSkillAPI.java
commands
experience
AddlevelsCommand.javaAddxpCommand.javaExperienceCommand.javaMmoeditCommand.javaSkillresetCommand.java
hardcore
HardcoreCommand.javaHardcoreModeCommand.javaVampirismCommand.java
player
InspectCommand.javaMccooldownCommand.javaMctopCommand.java
server
Mcmmoupgrade.java
skills
AcrobaticsCommand.javaAlchemyCommand.javaArcheryCommand.javaAxesCommand.javaExcavationCommand.javaFishingCommand.javaHerbalismCommand.javaMiningCommand.javaRepairCommand.javaSalvageCommand.javaSkillCommand.javaSkillGuideCommand.javaSmeltingCommand.javaSwordsCommand.javaTamingCommand.javaUnarmedCommand.javaWoodcuttingCommand.java
config
AdvancedConfig.javaConfig.java
experience
ExperienceConfig.java
database
DatabaseManager.javaFlatfileDatabaseManager.javaSQLDatabaseManager.java
datatypes
experience
SkillXpGain.java
player
McMMOPlayer.javaPlayerProfile.java
skills
PrimarySkill.javaSecondaryAbility.javaSkillMilestone.javaSubSkill.javaSuperAbility.java
events
experience
McMMOPlayerExperienceEvent.javaMcMMOPlayerLevelChangeEvent.javaMcMMOPlayerLevelDownEvent.javaMcMMOPlayerLevelUpEvent.javaMcMMOPlayerXpGainEvent.java
skills
McMMOPlayerSkillEvent.java
abilities
McMMOPlayerAbilityActivateEvent.javaMcMMOPlayerAbilityDeactivateEvent.javaMcMMOPlayerAbilityEvent.java
alchemy
McMMOPlayerBrewEvent.javaMcMMOPlayerCatalysisEvent.java
fishing
McMMOPlayerFishingEvent.java
repair
McMMOPlayerRepairCheckEvent.java
salvage
McMMOPlayerSalvageCheckEvent.java
secondaryabilities
SecondaryAbilityEvent.javaSubSkillEvent.javaSubSkillWeightedActivationCheckEvent.java
unarmed
McMMOPlayerDisarmEvent.java
listeners
BlockListener.javaEntityListener.javaInventoryListener.javaPlayerListener.javaSelfListener.java
mcMMO.java
party
ShareHandler.java
runnables
commands
McrankCommandAsyncTask.javaMcrankCommandDisplayTask.javaMctopCommandAsyncTask.javaMctopCommandDisplayTask.java
database
FormulaConversionTask.java
skills
AbilityCooldownTask.javaAbilityDisableTask.javaAlchemyBrewTask.javaAwardCombatXpTask.java
skills
SkillManager.java
acrobatics
AcrobaticsManager.java
alchemy
AlchemyManager.javaAlchemyPotionBrewer.java
archery
ArcheryManager.java
axes
AxesManager.java
child
ChildConfig.javaFamilyTree.java
excavation
Excavation.javaExcavationManager.java
fishing
FishingManager.java
herbalism
HerbalismManager.java
mining
Mining.javaMiningManager.java
repair
RepairManager.java
salvage
SalvageManager.java
smelting
Smelting.javaSmeltingManager.java
swords
SwordsManager.java
taming
TamingManager.java
unarmed
UnarmedManager.java
woodcutting
Woodcutting.javaWoodcuttingManager.java
util
BlockUtils.javaEventUtils.javaHardcoreManager.javaHolidayManager.javaMotd.javaPermissions.javaStringUtils.java
commands
CommandRegistrationManager.javaCommandUtils.java
experience
FormulaManager.java
scoreboards
ScoreboardManager.javaScoreboardWrapper.java
skills
CombatUtils.javaPerksUtils.javaSkillMilestoneManager.javaSkillUtils.javaSubSkillActivationType.java
resources
config.yml
locale
locale_de.propertieslocale_en_US.propertieslocale_ko.properties

4
src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java

@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.datatypes.skills.PrimarySkill;
import com.gmail.nossr50.datatypes.skills.XPGainReason;
import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
import com.gmail.nossr50.skills.SkillManager;
@ -17,7 +17,7 @@ public class AlchemyManager extends SkillManager {
private final double LUCKY_MODIFIER = 4.0 / 3.0;
public AlchemyManager(McMMOPlayer mcMMOPlayer) {
super(mcMMOPlayer, SkillType.ALCHEMY);
super(mcMMOPlayer, PrimarySkill.ALCHEMY);
}
public int getTier() {

4
src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java

@ -16,7 +16,7 @@ import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
import com.gmail.nossr50.datatypes.skills.SubSkill;
import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
import com.gmail.nossr50.events.fake.FakeBrewEvent;
@ -94,7 +94,7 @@ public final class AlchemyPotionBrewer {
}
private static List<ItemStack> getValidIngredients(Player player) {
return PotionConfig.getInstance().getIngredients((player == null || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS)) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
return PotionConfig.getInstance().getIngredients((player == null || !Permissions.isSubSkillEnabled(player, SubSkill.ALCHEMY_CONCOCTIONS)) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
}
public static void finishBrewing(BlockState brewingStand, Player player, boolean forced) {