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-19 21:29:34 +01:00
parent 2d3ddef181
commit 281a125584
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/me/unurled/sacredrealms/sr/components/item/Item.java
View file

@ -8,6 +8,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -73,7 +74,7 @@ public class Item {
this.rarity = Rarity.COMMON;
this.customModelData = 0;
this.abilities = List.of();
this.attributes = new HashMap<>();
this.attributes = new EnumMap<>(Attribute.class);
this.enchantments = new HashMap<>();
this.type = ItemType.MISC;
}
@ -86,7 +87,7 @@ public class Item {
this.rarity = Rarity.COMMON;
this.customModelData = 0;
this.abilities = List.of();
this.attributes = new HashMap<>();
this.attributes = new EnumMap<>(Attribute.class);
this.enchantments = new HashMap<>();
this.type = ItemType.MISC;
}

5
src/main/java/me/unurled/sacredrealms/sr/components/item/ItemManager.java
View file

@ -32,10 +32,7 @@ public class ItemManager extends Manager {
Gson gson =
new GsonBuilder().registerTypeAdapter(Item.class, new ItemStackSerializer()).create();
items.forEach(
(id, item) -> {
dh.set("sr.items." + id, gson.toJson(item));
});
items.forEach((id, item) -> dh.set("sr.items." + id, gson.toJson(item)));
}
/** Load the data */

5
src/main/java/me/unurled/sacredrealms/sr/components/item/Rarity.java
View file

@ -23,9 +23,9 @@ public enum Rarity {
private final Integer weight;
private final TextColor color;
Rarity(String name, String ID, Integer weight, TextColor color) {
Rarity(String name, String id, Integer weight, TextColor color) {
this.name = name;
this.id = ID;
this.id = id;
this.weight = weight;
this.color = color;
}
@ -34,6 +34,7 @@ public enum Rarity {
return name;
}
@SuppressWarnings("unused")
public String getId() {
return id;
}

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

@ -213,7 +213,7 @@ public class SRPlayer {
@SuppressWarnings("unused")
public @NotNull Map<Attribute, Double> getItemAttributes(Item item) {
if (itemAttributes == null) itemAttributes = new EnumMap<>(Attribute.class);
HashMap<Attribute, Double> map = new HashMap<>();
Map<Attribute, Double> map = new HashMap<>();
itemAttributes.forEach((k, v) -> map.put(k, v.getOrDefault(item.toItemStack(), 0d)));
return map;
}