code refactoring
This commit is contained in:
parent
2d3ddef181
commit
281a125584
4 changed files with 8 additions and 9 deletions
|
@ -8,6 +8,7 @@ import com.google.gson.Gson;
|
||||||
import com.google.gson.GsonBuilder;
|
import com.google.gson.GsonBuilder;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import java.lang.reflect.Type;
|
import java.lang.reflect.Type;
|
||||||
|
import java.util.EnumMap;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -73,7 +74,7 @@ public class Item {
|
||||||
this.rarity = Rarity.COMMON;
|
this.rarity = Rarity.COMMON;
|
||||||
this.customModelData = 0;
|
this.customModelData = 0;
|
||||||
this.abilities = List.of();
|
this.abilities = List.of();
|
||||||
this.attributes = new HashMap<>();
|
this.attributes = new EnumMap<>(Attribute.class);
|
||||||
this.enchantments = new HashMap<>();
|
this.enchantments = new HashMap<>();
|
||||||
this.type = ItemType.MISC;
|
this.type = ItemType.MISC;
|
||||||
}
|
}
|
||||||
|
@ -86,7 +87,7 @@ public class Item {
|
||||||
this.rarity = Rarity.COMMON;
|
this.rarity = Rarity.COMMON;
|
||||||
this.customModelData = 0;
|
this.customModelData = 0;
|
||||||
this.abilities = List.of();
|
this.abilities = List.of();
|
||||||
this.attributes = new HashMap<>();
|
this.attributes = new EnumMap<>(Attribute.class);
|
||||||
this.enchantments = new HashMap<>();
|
this.enchantments = new HashMap<>();
|
||||||
this.type = ItemType.MISC;
|
this.type = ItemType.MISC;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,10 +32,7 @@ public class ItemManager extends Manager {
|
||||||
Gson gson =
|
Gson gson =
|
||||||
new GsonBuilder().registerTypeAdapter(Item.class, new ItemStackSerializer()).create();
|
new GsonBuilder().registerTypeAdapter(Item.class, new ItemStackSerializer()).create();
|
||||||
|
|
||||||
items.forEach(
|
items.forEach((id, item) -> dh.set("sr.items." + id, gson.toJson(item)));
|
||||||
(id, item) -> {
|
|
||||||
dh.set("sr.items." + id, gson.toJson(item));
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Load the data */
|
/** Load the data */
|
||||||
|
|
|
@ -23,9 +23,9 @@ public enum Rarity {
|
||||||
private final Integer weight;
|
private final Integer weight;
|
||||||
private final TextColor color;
|
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.name = name;
|
||||||
this.id = ID;
|
this.id = id;
|
||||||
this.weight = weight;
|
this.weight = weight;
|
||||||
this.color = color;
|
this.color = color;
|
||||||
}
|
}
|
||||||
|
@ -34,6 +34,7 @@ public enum Rarity {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
|
@ -213,7 +213,7 @@ public class SRPlayer {
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
public @NotNull Map<Attribute, Double> getItemAttributes(Item item) {
|
public @NotNull Map<Attribute, Double> getItemAttributes(Item item) {
|
||||||
if (itemAttributes == null) itemAttributes = new EnumMap<>(Attribute.class);
|
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)));
|
itemAttributes.forEach((k, v) -> map.put(k, v.getOrDefault(item.toItemStack(), 0d)));
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue