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

clean up if/else formatting

Browse Source
This commit is contained in:
nossr50
2024-05-19 14:09:00 -07:00
parent 7266563ca9
commit d0ab2bdb2f
107 changed files with 526 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java
View File

@@ -28,8 +28,7 @@ public class ExperienceBarManager {
private HashSet<PrimarySkillType> alwaysVisible;
private HashSet<PrimarySkillType> disabledBars;
public ExperienceBarManager(McMMOPlayer mcMMOPlayer)
{
public ExperienceBarManager(McMMOPlayer mcMMOPlayer) {
this.mcMMOPlayer = mcMMOPlayer;
init();
}
@@ -44,8 +43,7 @@ public class ExperienceBarManager {
disabledBars = new HashSet<>();
}
public void updateExperienceBar(PrimarySkillType primarySkillType, Plugin plugin)
{
public void updateExperienceBar(PrimarySkillType primarySkillType, Plugin plugin) {
if (disabledBars.contains(primarySkillType)
|| !ExperienceConfig.getInstance().isExperienceBarsEnabled()
|| !ExperienceConfig.getInstance().isExperienceBarEnabled(primarySkillType))
@@ -65,8 +63,7 @@ public class ExperienceBarManager {
experienceBarWrapper.showExperienceBar();
//Setup Hide Bar Task
if (experienceBarHideTaskHashMap.get(primarySkillType) != null)
{
if (experienceBarHideTaskHashMap.get(primarySkillType) != null) {
experienceBarHideTaskHashMap.get(primarySkillType).cancel();
}
@@ -82,14 +79,12 @@ public class ExperienceBarManager {
experienceBarHideTaskHashMap.put(primarySkillType, experienceBarHideTask);
}
public void hideExperienceBar(PrimarySkillType primarySkillType)
{
public void hideExperienceBar(PrimarySkillType primarySkillType) {
if (experienceBars.containsKey(primarySkillType))
experienceBars.get(primarySkillType).hideExperienceBar();
}
public void clearTask(PrimarySkillType primarySkillType)
{
public void clearTask(PrimarySkillType primarySkillType) {
experienceBarHideTaskHashMap.remove(primarySkillType);
}

21
src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java
View File

@@ -29,8 +29,7 @@ public class ExperienceBarWrapper {
protected String niceSkillName;
protected String title;
public ExperienceBarWrapper(PrimarySkillType primarySkillType, McMMOPlayer mcMMOPlayer)
{
public ExperienceBarWrapper(PrimarySkillType primarySkillType, McMMOPlayer mcMMOPlayer) {
this.mcMMOPlayer = mcMMOPlayer;
this.primarySkillType = primarySkillType;
title = "";
@@ -43,8 +42,7 @@ public class ExperienceBarWrapper {
initBar();
}
private void initBar()
{
private void initBar() {
title = getTitleTemplate();
createBossBar();
}
@@ -115,8 +113,7 @@ public class ExperienceBarWrapper {
}
//Every time progress updates we need to check for a title update
if (getLevel() != lastLevelUpdated || ExperienceConfig.getInstance().getDoExperienceBarsAlwaysUpdateTitle())
{
if (getLevel() != lastLevelUpdated || ExperienceConfig.getInstance().getDoExperienceBarsAlwaysUpdateTitle()) {
updateTitle();
lastLevelUpdated = getLevel();
}
@@ -134,23 +131,19 @@ public class ExperienceBarWrapper {
return bossBar.isVisible();
}
public void hideExperienceBar()
{
public void hideExperienceBar() {
bossBar.setVisible(false);
}
public void showExperienceBar()
{
public void showExperienceBar() {
bossBar.setVisible(true);
}
/*public NamespacedKey getKey()
{
/*public NamespacedKey getKey() {
return bossBar
}*/
private void createBossBar()
{
private void createBossBar() {
bossBar = mcMMOPlayer.getPlayer().getServer().createBossBar(
title,
ExperienceConfig.getInstance().getExperienceBarColor(primarySkillType),

3
src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java
View File

@@ -135,8 +135,7 @@ public class FormulaManager {
* @param formulaType target formulaType
*/
private int processXPToNextLevel(int level, FormulaType formulaType) {
if (mcMMO.isRetroModeEnabled())
{
if (mcMMO.isRetroModeEnabled()) {
return processXPRetroToNextLevel(level, formulaType);
} else {
return processStandardXPToNextLevel(level, formulaType);