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

*: go back to 2.7.7, add @NotNull and @Nullable annotations for CosmeticHolder interface

Browse Source
This commit is contained in:
yusshu
2025-03-03 00:05:19 -05:00
parent 52de7425e4
commit 4136d19396
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -8,7 +8,7 @@ plugins {
} }
group = "com.hibiscusmc" group = "com.hibiscusmc"
version = "2.8.0${getGitCommitHash()}" version = "2.7.7${getGitCommitHash()}"
allprojects { allprojects {
apply(plugin = "java") apply(plugin = "java")

18
common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticHolder.java
View File

@@ -15,9 +15,9 @@ import java.util.Objects;
* users, for example. * users, for example.
*/ */
public interface CosmeticHolder { public interface CosmeticHolder {
@Nullable Cosmetic getCosmetic(CosmeticSlot slot); @Nullable Cosmetic getCosmetic(@NotNull CosmeticSlot slot);
ImmutableCollection<Cosmetic> getCosmetics(); @NotNull ImmutableCollection<Cosmetic> getCosmetics();
void addCosmetic(@NotNull Cosmetic cosmetic, @Nullable Color color); void addCosmetic(@NotNull Cosmetic cosmetic, @Nullable Color color);
@@ -32,29 +32,29 @@ public interface CosmeticHolder {
} }
} }
void removeCosmeticSlot(CosmeticSlot slot); void removeCosmeticSlot(@NotNull CosmeticSlot slot);
default void removeCosmeticSlot(Cosmetic cosmetic) { default void removeCosmeticSlot(@NotNull Cosmetic cosmetic) {
removeCosmeticSlot(cosmetic.getSlot()); removeCosmeticSlot(cosmetic.getSlot());
} }
default boolean hasCosmeticInSlot(CosmeticSlot slot) { default boolean hasCosmeticInSlot(@NotNull CosmeticSlot slot) {
return getCosmetic(slot) != null; return getCosmetic(slot) != null;
} }
default boolean hasCosmeticInSlot(Cosmetic cosmetic) { default boolean hasCosmeticInSlot(@NotNull Cosmetic cosmetic) {
final var existingCosmetic = getCosmetic(cosmetic.getSlot()); final var existingCosmetic = getCosmetic(cosmetic.getSlot());
if (existingCosmetic == null) return false; if (existingCosmetic == null) return false;
return Objects.equals(cosmetic.getId(), existingCosmetic.getId()); return Objects.equals(cosmetic.getId(), existingCosmetic.getId());
} }
default boolean canEquipCosmetic(Cosmetic cosmetic) { default boolean canEquipCosmetic(@NotNull Cosmetic cosmetic) {
return canEquipCosmetic(cosmetic, false); return canEquipCosmetic(cosmetic, false);
} }
boolean canEquipCosmetic(Cosmetic cosmetic, boolean ignoreWardrobe); boolean canEquipCosmetic(@NotNull Cosmetic cosmetic, boolean ignoreWardrobe);
void updateCosmetic(CosmeticSlot slot); void updateCosmetic(@NotNull CosmeticSlot slot);
/** /**
* Just for backwards compatibility, ensures that the given viewer and the given cosmetic holder * Just for backwards compatibility, ensures that the given viewer and the given cosmetic holder

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

@@ -209,12 +209,12 @@ public class CosmeticUser implements CosmeticHolder {
} }
@Override @Override
public Cosmetic getCosmetic(CosmeticSlot slot) { public Cosmetic getCosmetic(@NotNull CosmeticSlot slot) {
return playerCosmetics.get(slot); return playerCosmetics.get(slot);
} }
@Override @Override
public ImmutableCollection<Cosmetic> getCosmetics() { public @NotNull ImmutableCollection<Cosmetic> getCosmetics() {
return ImmutableList.copyOf(playerCosmetics.values()); return ImmutableList.copyOf(playerCosmetics.values());
} }
@@ -268,7 +268,7 @@ public class CosmeticUser implements CosmeticHolder {
} }
@Override @Override
public void removeCosmeticSlot(CosmeticSlot slot) { public void removeCosmeticSlot(@NotNull CosmeticSlot slot) {
// API // API
PlayerCosmeticRemoveEvent event = new PlayerCosmeticRemoveEvent(this, getCosmetic(slot)); PlayerCosmeticRemoveEvent event = new PlayerCosmeticRemoveEvent(this, getCosmetic(slot));
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
@@ -291,7 +291,7 @@ public class CosmeticUser implements CosmeticHolder {
} }
@Override @Override
public boolean hasCosmeticInSlot(CosmeticSlot slot) { public boolean hasCosmeticInSlot(@NotNull CosmeticSlot slot) {
return playerCosmetics.containsKey(slot); return playerCosmetics.containsKey(slot);
} }
@@ -300,7 +300,7 @@ public class CosmeticUser implements CosmeticHolder {
} }
@Override @Override
public void updateCosmetic(CosmeticSlot slot) { public void updateCosmetic(@NotNull CosmeticSlot slot) {
if (getCosmetic(slot) == null) { if (getCosmetic(slot) == null) {
return; return;
} }
@@ -641,7 +641,7 @@ public class CosmeticUser implements CosmeticHolder {
} }
@Override @Override
public boolean canEquipCosmetic(Cosmetic cosmetic, boolean ignoreWardrobe) { public boolean canEquipCosmetic(@NotNull Cosmetic cosmetic, boolean ignoreWardrobe) {
if (!cosmetic.requiresPermission()) return true; if (!cosmetic.requiresPermission()) return true;
if (isInWardrobe() && !ignoreWardrobe) { if (isInWardrobe() && !ignoreWardrobe) {
if (WardrobeSettings.isTryCosmeticsInWardrobe() && userWardrobeManager.getWardrobeStatus().equals(UserWardrobeManager.WardrobeStatus.RUNNING)) return true; if (WardrobeSettings.isTryCosmeticsInWardrobe() && userWardrobeManager.getWardrobeStatus().equals(UserWardrobeManager.WardrobeStatus.RUNNING)) return true;