SacredRealms/SR-Game
1
0
Fork 0
Code Issues 19 Pull requests Projects 1 Releases Activity Actions

code refactoring

Browse source
This commit is contained in:
unurled 2024-03-18 20:56:40 +01:00
parent abd733fd09
commit 57ddb6ca01
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java
View file

@ -7,6 +7,7 @@ import com.google.gson.annotations.Expose;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import me.unurled.sacredrealms.sr.components.attributes.Attribute; import me.unurled.sacredrealms.sr.components.attributes.Attribute;
import me.unurled.sacredrealms.sr.components.item.Item; import me.unurled.sacredrealms.sr.components.item.Item;
@ -40,10 +41,6 @@ public class SRPlayer {
this.uuid = uuid; this.uuid = uuid;
} }
public SRPlayer(@NotNull Player player) {
this.uuid = player.getUniqueId();
}
@NotNull @NotNull
public UUID getUuid() { public UUID getUuid() {
return uuid; return uuid;
@ -59,7 +56,7 @@ public class SRPlayer {
} }
@NotNull @NotNull
public HashMap<Attribute, Double> getAttributes() { public Map<Attribute, Double> getAttributes() {
return attributes; return attributes;
} }
@ -151,14 +148,17 @@ public class SRPlayer {
i.setItemMeta(im); i.setItemMeta(im);
} }
@SuppressWarnings("unused")
public void addPotionEffect(@NotNull PotionEffect effect) { public void addPotionEffect(@NotNull PotionEffect effect) {
potionEffects.add(effect); potionEffects.add(effect);
} }
@SuppressWarnings("unused")
public void removePotionEffect(@NotNull PotionEffect effect) { public void removePotionEffect(@NotNull PotionEffect effect) {
potionEffects.remove(effect); potionEffects.remove(effect);
} }
@SuppressWarnings("unused")
public void clearPotionEffects() { public void clearPotionEffects() {
potionEffects.clear(); potionEffects.clear();
} }
@ -193,6 +193,7 @@ public class SRPlayer {
} }
} }
@SuppressWarnings("unused")
public @Nullable Double getItemAttributes(@NotNull Attribute attribute, @NotNull ItemStack item) { public @Nullable Double getItemAttributes(@NotNull Attribute attribute, @NotNull ItemStack item) {
if (itemAttributes == null) itemAttributes = new HashMap<>(); if (itemAttributes == null) itemAttributes = new HashMap<>();
if (itemAttributes.containsKey(attribute)) { if (itemAttributes.containsKey(attribute)) {
@ -201,15 +202,17 @@ public class SRPlayer {
return null; return null;
} }
public @NotNull HashMap<ItemStack, Double> getItemAttributes(@NotNull Attribute attribute) { @SuppressWarnings("unused")
public @NotNull Map<ItemStack, Double> getItemAttributes(@NotNull Attribute attribute) {
if (itemAttributes == null) itemAttributes = new HashMap<>(); if (itemAttributes == null) itemAttributes = new HashMap<>();
return itemAttributes.getOrDefault(attribute, new HashMap<>()); return itemAttributes.getOrDefault(attribute, new HashMap<>());
} }
public @NotNull HashMap<Attribute, Double> getItemAttributes(Item item) { @SuppressWarnings("unused")
public @NotNull Map<Attribute, Double> getItemAttributes(Item item) {
if (itemAttributes == null) itemAttributes = new HashMap<>(); if (itemAttributes == null) itemAttributes = new HashMap<>();
HashMap<Attribute, Double> map = new HashMap<>(); HashMap<Attribute, Double> map = new HashMap<>();
itemAttributes.forEach((k, v) -> map.put(k, v.get(item))); itemAttributes.forEach((k, v) -> map.put(k, v.getOrDefault(item.toItemStack(), 0d)));
return map; return map;
} }