Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-30 04:19:28 +00:00
Code Issues Releases Activity

clean: reduce nesting

Browse Source
This commit is contained in:
Craftinators
2023-02-28 14:40:58 -05:00
parent aed34ec28d
commit e2d3391070
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java
View File

@@ -12,9 +12,10 @@ public class ActionCosmeticShow extends Action {
@Override
public void run(@NotNull CosmeticUser user, String raw) {
if (user.getHidden()) {
if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; // Do not hide if its already off for WG
user.showCosmetics();
}
if (!user.getHidden()) return;
// Do not hide if it's already off for WG
if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return;
user.showCosmetics();
}
}

1
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java
View File

@@ -17,6 +17,7 @@ public class ActionCosmeticToggle extends Action {
user.showCosmetics();
return;
}
user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
}
}

5
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionEquip.java
View File

@@ -14,9 +14,8 @@ public class ActionEquip extends Action {
@Override
public void run(CosmeticUser user, String raw) {
Cosmetic cosmetic = Cosmetics.getCosmetic(raw);
if (cosmetic == null) {
return;
}
if (cosmetic == null) return;
user.addPlayerCosmetic(cosmetic);
}
}

2
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMenu.java
View File

@@ -22,10 +22,12 @@ public class ActionMenu extends Action {
raw = raw.replaceAll("-o", "");
ignorePermission = true;
}
if (!Menus.hasMenu(raw)) {
HMCCosmeticsPlugin.getInstance().getLogger().info("Invalid Action Menu -> " + raw);
return;
}
Menu menu = Menus.getMenu(raw);
HMCCosmeticsPlugin.getInstance().getLogger().info(raw + " | " + ignorePermission);
menu.openMenu(user, ignorePermission);

8
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java
View File

@@ -29,10 +29,9 @@ public class ActionParticle extends Action {
MessagesUtil.sendDebugMessages("The particle " + rawString[0] + " does not exist!");
return;
}
boolean multi = false;
if (particleType.multi() != null) {
multi = true; // Should work?
}
// Should work?
boolean multi = particleType.multi() != null;
var particle = multi ? particleType.multi() : particleType.single();
if (particle instanceof DestinationParticle || particle instanceof BlockDataParticle
@@ -40,6 +39,7 @@ public class ActionParticle extends Action {
MessagesUtil.sendDebugMessages("The particle " + rawString[0] + " is not supported by this action!");
return;
}
particle = ServerUtils.addParticleValues(particle, rawString);
Location location = user.getPlayer().getLocation();
for (Player player : PacketManager.getViewers(location)) {

5
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionUnequip.java
View File

@@ -13,9 +13,8 @@ public class ActionUnequip extends Action {
@Override
public void run(CosmeticUser user, String raw) {
if (!EnumUtils.isValidEnum(CosmeticSlot.class, raw)) {
return;
}
if (!EnumUtils.isValidEnum(CosmeticSlot.class, raw)) return;
CosmeticSlot slot = CosmeticSlot.valueOf(raw);
user.removeCosmeticSlot(slot);
}