Skip to content

Commit

Permalink
clean up if/else formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@nossr50
nossr50 committed May 19, 2024
1 parent 7266563 commit d0ab2bd
Show file tree
Hide file tree
Showing 107 changed files with 526 additions and 1,038 deletions.
36 changes: 12 additions & 24 deletions src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1143,14 +1143,10 @@ public static int getXpNeededToLevel(int level, String formulaType) {
* @param blockStates the blocks to reward XP for
* @param mcMMOPlayer the target player
*/
public static void addXpFromBlocks(ArrayList<BlockState> blockStates, McMMOPlayer mcMMOPlayer)
{
for(BlockState bs : blockStates)
{
for(PrimarySkillType skillType : PrimarySkillType.values())
{
if (ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0)
{
public static void addXpFromBlocks(ArrayList<BlockState> blockStates, McMMOPlayer mcMMOPlayer) {
for(BlockState bs : blockStates) {
for(PrimarySkillType skillType : PrimarySkillType.values()) {
if (ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0) {
mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, bs.getType()), XPGainReason.PVE, XPGainSource.SELF);
}
}
Expand All @@ -1163,12 +1159,9 @@ public static void addXpFromBlocks(ArrayList<BlockState> blockStates, McMMOPlaye
* @param mcMMOPlayer the target player
* @param skillType target primary skill
*/
public static void addXpFromBlocksBySkill(ArrayList<BlockState> blockStates, McMMOPlayer mcMMOPlayer, PrimarySkillType skillType)
{
for(BlockState bs : blockStates)
{
if (ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0)
{
public static void addXpFromBlocksBySkill(ArrayList<BlockState> blockStates, McMMOPlayer mcMMOPlayer, PrimarySkillType skillType) {
for(BlockState bs : blockStates) {
if (ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0) {
mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, bs.getType()), XPGainReason.PVE, XPGainSource.SELF);
}
}
Expand All @@ -1179,12 +1172,9 @@ public static void addXpFromBlocksBySkill(ArrayList<BlockState> blockStates, McM
* @param blockState The target blockstate
* @param mcMMOPlayer The target player
*/
public static void addXpFromBlock(BlockState blockState, McMMOPlayer mcMMOPlayer)
{
for(PrimarySkillType skillType : PrimarySkillType.values())
{
if (ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0)
{
public static void addXpFromBlock(BlockState blockState, McMMOPlayer mcMMOPlayer) {
for(PrimarySkillType skillType : PrimarySkillType.values()) {
if (ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0) {
mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, blockState.getType()), XPGainReason.PVE, XPGainSource.SELF);
}
}
Expand All @@ -1196,10 +1186,8 @@ public static void addXpFromBlock(BlockState blockState, McMMOPlayer mcMMOPlayer
* @param mcMMOPlayer The target player
* @param skillType target primary skill
*/
public static void addXpFromBlockBySkill(BlockState blockState, McMMOPlayer mcMMOPlayer, PrimarySkillType skillType)
{
if (ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0)
{
public static void addXpFromBlockBySkill(BlockState blockState, McMMOPlayer mcMMOPlayer, PrimarySkillType skillType) {
if (ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0) {
mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, blockState.getType()), XPGainReason.PVE, XPGainSource.SELF);
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/gmail/nossr50/api/PartyAPI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ public static void addToParty(Player player, String partyName) {
if (party == null) {
party = new Party(new PartyLeader(player.getUniqueId(), player.getName()), partyName);
} else {
if (mcMMO.p.getPartyManager().isPartyFull(player, party))
{
if (mcMMO.p.getPartyManager().isPartyFull(player, party)) {
NotificationManager.sendPlayerInformation(player, NotificationType.PARTY_MESSAGE, "Commands.Party.PartyFull", party.toString());
return;
}
Expand All @@ -124,8 +123,7 @@ public static void addToParty(Player player, String partyName) {
* 0 or less for no size limit
* @return the max party size on this server
*/
public static int getMaxPartySize()
{
public static int getMaxPartySize() {
return mcMMO.p.getGeneralConfig().getPartyMaxSize();
}

Expand Down
36 changes: 12 additions & 24 deletions src/main/java/com/gmail/nossr50/commands/McImportCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,11 @@ private HashMap<String, ArrayList<String>> getConfigSectionsBlocks(String modNam
String skillName = "UNIDENTIFIED";
if (materialName.contains("ORE")) {
skillName = "Mining";
}
else if (materialName.contains("LOG") || materialName.contains("LEAVES")) {
} else if (materialName.contains("LOG") || materialName.contains("LEAVES")) {
skillName = "Woodcutting";
}
else if (materialName.contains("GRASS") || materialName.contains("SHORT_GRASS") || materialName.contains("FLOWER") || materialName.contains("CROP")) {
} else if (materialName.contains("GRASS") || materialName.contains("SHORT_GRASS") || materialName.contains("FLOWER") || materialName.contains("CROP")) {
skillName = "Herbalism";
}
else if (materialName.contains("DIRT") || materialName.contains("SAND")) {
} else if (materialName.contains("DIRT") || materialName.contains("SAND")) {
skillName = "Excavation";
}

Expand All @@ -222,8 +219,7 @@ else if (materialName.contains("DIRT") || materialName.contains("SAND")) {

if (skillName.equals("Mining")) {
skillContents.add(" " + " " + "Smelting_XP_Gain: 9");
}
else if (skillName.equals("Woodcutting")) {
} else if (skillName.equals("Woodcutting")) {
skillContents.add(" " + " " + "Is_Log: " + materialName.contains("LOG"));
}
}
Expand All @@ -239,20 +235,15 @@ private HashMap<String, ArrayList<String>> getConfigSectionsTools(String modName
String toolType = "UNIDENTIFIED";
if (materialName.contains("PICKAXE")) {
toolType = "Pickaxes";
}
else if (materialName.contains("AXE")) {
} else if (materialName.contains("AXE")) {
toolType = "Axes";
}
else if (materialName.contains("BOW")) {
} else if (materialName.contains("BOW")) {
toolType = "Bows";
}
else if (materialName.contains("HOE")) {
} else if (materialName.contains("HOE")) {
toolType = "Hoes";
}
else if (materialName.contains("SHOVEL") || materialName.contains("SPADE")) {
} else if (materialName.contains("SHOVEL") || materialName.contains("SPADE")) {
toolType = "Shovels";
}
else if (materialName.contains("SWORD")) {
} else if (materialName.contains("SWORD")) {
toolType = "Swords";
}

Expand All @@ -279,14 +270,11 @@ private HashMap<String, ArrayList<String>> getConfigSectionsArmor(String modName
String toolType = "UNIDENTIFIED";
if (materialName.contains("BOOT") || materialName.contains("SHOE")) {
toolType = "Boots";
}
else if (materialName.contains("CHESTPLATE") || materialName.contains("CHEST")) {
} else if (materialName.contains("CHESTPLATE") || materialName.contains("CHEST")) {
toolType = "Chestplates";
}
else if (materialName.contains("HELM") || materialName.contains("HAT")) {
} else if (materialName.contains("HELM") || materialName.contains("HAT")) {
toolType = "Helmets";
}
else if (materialName.contains("LEGGINGS") || materialName.contains("LEGS") || materialName.contains("PANTS")) {
} else if (materialName.contains("LEGGINGS") || materialName.contains("LEGS") || materialName.contains("PANTS")) {
toolType = "Leggings";
}

Expand Down
21 changes: 7 additions & 14 deletions src/main/java/com/gmail/nossr50/commands/XprateCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,14 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command

if (mcMMO.p.isXPEventEnabled()) {

if (mcMMO.p.getAdvancedConfig().useTitlesForXPEvent())
{
if (mcMMO.p.getAdvancedConfig().useTitlesForXPEvent()) {
NotificationManager.broadcastTitle(mcMMO.p.getServer(),
LocaleLoader.getString("Commands.Event.Stop"),
LocaleLoader.getString("Commands.Event.Stop.Subtitle"),
10, 10*20, 20);
}

if (mcMMO.p.getGeneralConfig().broadcastEventMessages())
{
if (mcMMO.p.getGeneralConfig().broadcastEventMessages()) {
mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Stop"));
mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Stop.Subtitle"));
}
Expand All @@ -72,34 +70,29 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command

if (CommandUtils.shouldDisableToggle(args[1])) {
mcMMO.p.setXPEventEnabled(false);
}
else if (CommandUtils.shouldEnableToggle(args[1])) {
} else if (CommandUtils.shouldEnableToggle(args[1])) {
mcMMO.p.setXPEventEnabled(true);
}
else {
} else {
return false;
}

int newXpRate = Integer.parseInt(args[0]);

if (newXpRate < 0)
{
if (newXpRate < 0) {
sender.sendMessage(ChatColor.RED+LocaleLoader.getString("Commands.NegativeNumberWarn"));
return true;
}

ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);

if (mcMMO.p.getAdvancedConfig().useTitlesForXPEvent())
{
if (mcMMO.p.getAdvancedConfig().useTitlesForXPEvent()) {
NotificationManager.broadcastTitle(mcMMO.p.getServer(),
LocaleLoader.getString("Commands.Event.Start"),
LocaleLoader.getString("Commands.Event.XP", newXpRate),
10, 10*20, 20);
}

if (mcMMO.p.getGeneralConfig().broadcastEventMessages())
{
if (mcMMO.p.getGeneralConfig().broadcastEventMessages()) {
mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Start"));
mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.XP", newXpRate));
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillT
return;

UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND, XPGainSource.COMMAND);
}
else {
} else {
profile.addXp(skill, value);
profile.scheduleAsyncSave();
}
Expand Down
18 changes: 6 additions & 12 deletions src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,13 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
skill = null;
}

if (skill != null && SkillTools.isChildSkill(skill))
{
if (skill != null && SkillTools.isChildSkill(skill)) {
sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
return true;
}

//Profile not loaded
if (UserManager.getPlayer(sender.getName()) == null)
{
if (UserManager.getPlayer(sender.getName()) == null) {
sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
return true;
}
Expand All @@ -82,8 +80,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
skill = null;
}

if (skill != null && SkillTools.isChildSkill(skill))
{
if (skill != null && SkillTools.isChildSkill(skill)) {
sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
return true;
}
Expand All @@ -110,8 +107,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
}

editValues(null, profile, skill, value, isSilent(args));
}
else {
} else {
editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, value, isSilent(args));
}

Expand Down Expand Up @@ -159,8 +155,7 @@ private boolean validateArguments(CommandSender sender, String skillName, String
protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
if (skill == null) {
sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
}
else {
} else {
sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", mcMMO.p.getSkillTools().getLocalizedSkillName(skill), playerName));
}
}
Expand All @@ -174,8 +169,7 @@ protected void editValues(Player player, PlayerProfile profile, PrimarySkillType
if (player != null) {
handlePlayerMessageAll(player, value, isSilent);
}
}
else {
} else {
handleCommand(player, profile, skill, value);

if (player != null) {
Expand Down
15 changes: 5 additions & 10 deletions src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command

if (args[0].equalsIgnoreCase("all")) {
skill = null;
}
else {
} else {
skill = mcMMO.p.getSkillTools().matchSkill(args[0]);
}

Expand All @@ -68,8 +67,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command

if (args[1].equalsIgnoreCase("all")) {
skill = null;
}
else {
} else {
skill = mcMMO.p.getSkillTools().matchSkill(args[1]);
}

Expand All @@ -93,8 +91,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
}

editValues(null, profile, skill);
}
else {
} else {
editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill);
}

Expand Down Expand Up @@ -156,8 +153,7 @@ private boolean validateArguments(CommandSender sender, String skillName) {
protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
if (skill == null) {
sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
}
else {
} else {
sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", mcMMO.p.getSkillTools().getLocalizedSkillName(skill), playerName));
}
}
Expand All @@ -171,8 +167,7 @@ protected void editValues(Player player, PlayerProfile profile, PrimarySkillType
if (player != null) {
handlePlayerMessageAll(player);
}
}
else {
} else {
handleCommand(player, profile, skill);

if (player != null) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
public class PartyChangePasswordCommand implements CommandExecutor {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
if (UserManager.getPlayer((Player) sender) == null)
{
if (UserManager.getPlayer((Player) sender) == null) {
sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
return true;
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
}

McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
if (mcMMOPlayer == null)
{
if (mcMMOPlayer == null) {
player.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
return true;
}
Expand Down Expand Up @@ -207,8 +206,7 @@ public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Comman
final McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

//Not Loaded
if (mcMMOPlayer == null)
{
if (mcMMOPlayer == null) {
sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
return ImmutableList.of();
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
Player player = (Player) sender;
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

if (UserManager.getPlayer(player) == null)
{
if (UserManager.getPlayer(player) == null) {
player.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
return true;
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
switch (args.length) {
case 0:
case 1:
if (UserManager.getPlayer((Player) sender) == null)
{
if (UserManager.getPlayer((Player) sender) == null) {
sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
return true;
}
Expand Down Expand Up @@ -70,8 +69,7 @@ private void displayPartyFeatures(Player player, Party party) {

if (isUnlockedFeature(party, partyFeature)) {
unlockedPartyFeatures.add(partyFeature.getLocaleString());
}
else {
} else {
lockedPartyFeatures.add(partyFeature.getFeatureLockedLocaleString());
}
}
Expand Down

0 comments on commit d0ab2bd

Please sign in to comment.