diff --git a/src/main/java/me/unurled/raxen/components/entity/other/custom/Humanoid.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/Humanoid.java index d7414f1..b51b7f8 100644 --- a/src/main/java/me/unurled/raxen/components/entity/other/custom/Humanoid.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/Humanoid.java @@ -30,7 +30,7 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class Humanoid extends Entity { +public abstract class Humanoid extends Entity { private String skin; // used to get the path to the skin private UUID skinUuid; // used to get the player skin (if i do it this way... diff --git a/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java b/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java index a17c5e0..7e1a2a2 100644 --- a/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java +++ b/src/main/java/me/unurled/raxen/components/entity/other/custom/hostile/low/Goblin.java @@ -33,7 +33,7 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class Goblin extends Entity { +public abstract class Goblin extends Entity { RaxenEntity goblin; diff --git a/src/main/java/me/unurled/raxen/components/items/ItemBuilder.java b/src/main/java/me/unurled/raxen/components/items/ItemBuilder.java index 121581f..1fe40ce 100644 --- a/src/main/java/me/unurled/raxen/components/items/ItemBuilder.java +++ b/src/main/java/me/unurled/raxen/components/items/ItemBuilder.java @@ -42,7 +42,7 @@ public class ItemBuilder { private Set itemFlags; private boolean hasAttributeModifiers; private Multimap attributeModifiers; - private List lore; + private List lore; private final Map enchantments; public ItemBuilder(ItemStack it) { @@ -90,7 +90,7 @@ public class ItemBuilder { } if (itm.hasLore()) { - lore = itm.getLore(); + lore = itm.lore(); } persistentDataContainer = itm.getPersistentDataContainer(); @@ -107,7 +107,7 @@ public class ItemBuilder { return this; } - public void lore(List lore) { + public void lore(List lore) { this.lore = lore; } diff --git a/src/main/java/me/unurled/raxen/components/items/ItemParser.java b/src/main/java/me/unurled/raxen/components/items/ItemParser.java index e29aaed..9a2272f 100644 --- a/src/main/java/me/unurled/raxen/components/items/ItemParser.java +++ b/src/main/java/me/unurled/raxen/components/items/ItemParser.java @@ -1,7 +1,9 @@ package me.unurled.raxen.components.items; +import java.util.ArrayList; import java.util.List; import me.unurled.raxen.utils.Utils; +import net.kyori.adventure.text.Component; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; @@ -36,7 +38,11 @@ public class ItemParser { private ItemBuilder applyConfig(ItemBuilder item) { if (section.contains("lore")) { - List lore = section.getStringList("lore"); + List l = section.getStringList("lore"); + List lore = new ArrayList<>(); + for (int i = 0; i < l.size(); i++) { + lore.add(i, Utils.colorComp(l.get(i))); + } item.lore(lore); } @@ -45,7 +51,8 @@ public class ItemParser { } if (section.contains("Pack")) { - item.modelData(section.getString("Pack.model", null), section.getInt("Pack.custom_model_data", 0)); + item.modelData(section.getString("Pack.model", null), + section.getInt("Pack.custom_model_data", 0)); } return item; } diff --git a/src/main/java/me/unurled/raxen/utils/EntityUtils.java b/src/main/java/me/unurled/raxen/utils/EntityUtils.java index 2cab28e..6df7100 100644 --- a/src/main/java/me/unurled/raxen/utils/EntityUtils.java +++ b/src/main/java/me/unurled/raxen/utils/EntityUtils.java @@ -1,7 +1,7 @@ package me.unurled.raxen.utils; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R3.CraftRegionAccessor; +import org.bukkit.craftbukkit.v1_20_R1.CraftRegionAccessor; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player;