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

chore: CosmeticUser move to non-deprecated internal methods to add cosmetics (and indicate nullability of update movement variables)

Browse Source
This commit is contained in:
Logan
2025-12-16 12:49:44 -06:00
parent af01ff600b
commit b0ba5fc011
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
View File

@@ -99,7 +99,7 @@ public class CosmeticUser implements CosmeticHolder {
Color color = null; Color color = null;
if (colorRGBInt != -1) color = Color.fromRGB(colorRGBInt); // -1 is defined as no color; anything else is a color if (colorRGBInt != -1) color = Color.fromRGB(colorRGBInt); // -1 is defined as no color; anything else is a color
this.addPlayerCosmetic(cosmetic, color); this.addCosmetic(cosmetic, color);
} }
this.applyHiddenState(userData.getHiddenReasons()); this.applyHiddenState(userData.getHiddenReasons());
} }
@@ -112,7 +112,7 @@ public class CosmeticUser implements CosmeticHolder {
* This is used to help hooking plugins apply custom logic to the user. * This is used to help hooking plugins apply custom logic to the user.
*/ */
protected boolean applyCosmetic(@NotNull Cosmetic cosmetic, @Nullable Color color) { protected boolean applyCosmetic(@NotNull Cosmetic cosmetic, @Nullable Color color) {
this.addPlayerCosmetic(cosmetic, color); this.addCosmetic(cosmetic, color);
return true; return true;
} }
@@ -317,7 +317,7 @@ public class CosmeticUser implements CosmeticHolder {
} }
@Override @Override
public boolean updateMovementCosmetic(CosmeticSlot slot, final Location from, final Location to) { public boolean updateMovementCosmetic(@NotNull CosmeticSlot slot, @NotNull final Location from, @NotNull final Location to) {
final Cosmetic cosmetic = playerCosmetics.get(slot); final Cosmetic cosmetic = playerCosmetics.get(slot);
if(cosmetic == null) { if(cosmetic == null) {
return false; return false;
@@ -332,7 +332,7 @@ public class CosmeticUser implements CosmeticHolder {
return true; return true;
} }
public boolean updateCosmetic(final Cosmetic cosmetic) { public boolean updateCosmetic(@NotNull final Cosmetic cosmetic) {
return updateCosmetic(cosmetic.getSlot()); return updateCosmetic(cosmetic.getSlot());
} }
@@ -372,7 +372,7 @@ public class CosmeticUser implements CosmeticHolder {
} }
} }
public ItemStack getUserCosmeticItem(CosmeticSlot slot) { public ItemStack getUserCosmeticItem(@NotNull CosmeticSlot slot) {
Cosmetic cosmetic = getCosmetic(slot); Cosmetic cosmetic = getCosmetic(slot);
if (cosmetic == null) return new ItemStack(Material.AIR); if (cosmetic == null) return new ItemStack(Material.AIR);
return getUserCosmeticItem(cosmetic); return getUserCosmeticItem(cosmetic);