Repo-Mirror/HibiscusCommons
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HibiscusCommons.git synced 2025-12-30 20:39:19 +00:00
Code Issues Releases Activity

feat: improve backwards compatibility with other plugins

Browse Source
This commit is contained in:
LoJoSho
2024-02-23 18:14:28 -06:00
parent 1e7a8ce720
commit 35928403d3
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/me/lojosho/hibiscuscommons/config/serializer/ItemBuilderSerializer.java
View File

@@ -63,7 +63,7 @@ public class ItemBuilderSerializer implements TypeSerializer<ItemBuilder> {
if (materialNode.virtual()) return null;
ItemBuilder builder = new ItemBuilder(materialNode.getString());
ItemBuilder builder = new ItemBuilder(materialNode.getString("AIR"));
if (!amountNode.virtual()) builder.setAmount(amountNode.getInt(1));
if (!nameNode.virtual()) builder.setDisplayName(nameNode.getString(""));
if (!unbreakableNode.virtual()) builder.setUnbreakable(unbreakableNode.getBoolean());

8
common/src/main/java/me/lojosho/hibiscuscommons/config/serializer/SerializerManager.java
View File

@@ -20,11 +20,11 @@ public class SerializerManager {
return ItemBuilderSerializer.INSTANCE;
}
public static ItemBuilder serializeItemBuilder(ConfigurationNode node) throws SerializationException {
return ItemBuilderSerializer.INSTANCE.deserialize(ItemBuilder.class, node);
public static ItemBuilder serializeItemBuilder(ConfigurationNode source) throws SerializationException {
return ItemBuilderSerializer.INSTANCE.deserialize(ItemBuilder.class, source);
}
public static Location serializeLocation(ConfigurationNode node) throws SerializationException {
return LocationSerializer.INSTANCE.deserialize(Location.class, node);
public static Location serializeLocation(ConfigurationNode source) throws SerializationException {
return LocationSerializer.INSTANCE.deserialize(Location.class, source);
}
}

14
common/src/main/java/me/lojosho/hibiscuscommons/items/ItemBuilder.java
View File

@@ -49,15 +49,11 @@ public class ItemBuilder {
private Color color;
public ItemBuilder(String material) {
ItemStack generatedItem = Hooks.getItem(material);
if (generatedItem == null) throw new IllegalArgumentException("Item String " + material + " is not valid");
new ItemBuilder(generatedItem);
setMaterial(material);
}
public ItemBuilder(Material material) {
ItemStack generatedItem = Hooks.getItem(material.toString());
if (generatedItem == null) throw new IllegalArgumentException("Item String " + material + " is not valid");
new ItemBuilder(generatedItem);
setMaterial(material.toString());
}
public ItemBuilder(@NotNull ItemStack itemStack) {
@@ -74,7 +70,7 @@ public class ItemBuilder {
this.texture = skullMeta.getPersistentDataContainer().get(InventoryUtils.getSkullTexture(), PersistentDataType.STRING);
}
}
if (meta.hasLore()) this.lore = new ArrayList<>(meta.getLore());
if (meta.hasLore()) this.lore = new ArrayList<>(Objects.requireNonNullElse(meta.getLore(), new ArrayList<>()));
if (meta instanceof Colorable colorable) {
this.color = colorable.getColor().getColor();
}
@@ -166,7 +162,7 @@ public class ItemBuilder {
* @param mode
* @return
*/
public ItemBuilder setLoreAppendMode(LoreAppendMode mode) {
public ItemBuilder setLoreAppendMode(@NotNull LoreAppendMode mode) {
this.loreAppendMode = mode;
return this;
}
@@ -338,7 +334,7 @@ public class ItemBuilder {
List<String> lore = new ArrayList<>();
LoreAppendMode mode = loreAppendMode;
if (!meta.hasLore() && loreAppendMode != null) mode = LoreAppendMode.IGNORE;
if (!meta.hasLore() && loreAppendMode == null) mode = LoreAppendMode.IGNORE;
switch (mode) {
case IGNORE: // DM lore is not added at all
lore.addAll(itemLore);