Skip to content

Armorstand Armor Parsing Fixed #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: staging
Choose a base branch
from
Open

Armorstand Armor Parsing Fixed #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a146ea
Armorstand armor parsing now works with modern material names, offhan…
KyGuy2002 Apr 20, 2022
3fec4fa
removed debug and import
KyGuy2002 Apr 20, 2022
0e0589c
Moved parseArmorData from utils back to show
KyGuy2002 Apr 22, 2022
134aa00
Colored armor parsing now supports both formats: "ITEM_NAME:data(r,g,…
KyGuy2002 Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 113 additions & 57 deletions src/main/java/network/palace/show/Show.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import network.palace.show.sequence.light.LightSequence;
import network.palace.show.sequence.particle.ParticleSequence;
import network.palace.show.utils.HeadUtil;
import network.palace.show.utils.MiscUtil;
import network.palace.show.utils.ShowUtil;
import network.palace.show.utils.WorldUtil;
import org.bukkit.*;
Expand Down Expand Up @@ -169,7 +170,6 @@ public boolean add(ShowAction mt) {
continue;
}
boolean small = Boolean.parseBoolean(args[2]);
//ArmorStand 0 false skull:myHash;299(234,124,41);300;301
ArmorData armorData = parseArmorData(args[3]);
ShowStand stand = new ShowStand(id, small, armorData);
standmap.put(id, stand);
Expand Down Expand Up @@ -393,80 +393,136 @@ private double rad(double v) {
return (v * Math.PI) / 180;
}

/*
Input:
LEATHER_HELMET;LEATHER_CHESTPLATE;LEATHER_LEGGINGS;LEATHER_BOOTS;WOOD_SWORD;TOTEM_OF_UNDYING
skull:<playerTextureResourceHash>;LEATHER_CHESTPLATE;LEATHER_LEGGINGS;LEATHER_BOOTS;WOOD_SWORD;TOTEM_OF_UNDYING
LEATHER_HELMET;LEATHER_CHESTPLATE:(5,5,5);LEATHER_LEGGINGS:data(7,7,7);LEATHER_BOOTS;WOOD_SWORD;TOTEM_OF_UNDYING
*/

/**
* Parses the armor data from the string.
* @param s Input string. Format: head;chest;leg;boot;hand;offhand
* @return The armor data
* @throws Exception If there was an error parsing data
*/
private ArmorData parseArmorData(String s) throws Exception {
String[] list = s.split(";");
ItemStack head = new ItemStack(Material.AIR);
ItemStack chestplate = new ItemStack(Material.AIR);
ItemStack leggings = new ItemStack(Material.AIR);
ItemStack boots = new ItemStack(Material.AIR);
ItemStack itemInMainHand = new ItemStack(Material.AIR);
int i = 0;
if (list.length >= 4) {
for (String st : list) {
i++;
if (i == 1) {
if (st.startsWith("skull")) {
head = HeadUtil.getPlayerHead(st.split(":")[1]);
ItemStack itemInOffHand = new ItemStack(Material.AIR);

// Get itemstack from string
int slot = -1;
for (String data : list) {
slot++;

switch (slot) {

case 0: { // Head

// Try to parse skull
if (data.startsWith("skull")) {
head = HeadUtil.getPlayerHead(data.split(":")[1]);
continue;
}
}
if (st.contains("(")) {
String[] color = st.split("\\(");
String[] l = color[0].split(":");
int id = Integer.parseInt(l[0]);
byte dam = l.length > 1 ? Byte.parseByte(l[1]) : 0;
Material type = Material.getMaterial(ShowUtil.convertMaterialNoData(id).name());
if (!type.name().toLowerCase().contains("leather")) {

// Try to color leather armor
if (data.endsWith(")")) {
// Returns colored leather, or whatever item was passed in if not leather
head = parseColoredArmor(data);
continue;
}
ItemStack temp = new ItemStack(type, 1, dam);
LeatherArmorMeta lam = (LeatherArmorMeta) temp.getItemMeta();
String[] cls = color[1].replaceAll("[()]", "").split(",");
lam.setColor(Color.fromRGB(Integer.parseInt(cls[0]), Integer.parseInt(cls[1]),
Integer.parseInt(cls[2])));
temp.setItemMeta(lam);
switch (i) {
case 1:
head = temp;
continue;
case 2:
chestplate = temp;
continue;
case 3:
leggings = temp;
continue;
case 4:
boots = temp;
continue;
case 5:
itemInMainHand = temp;
continue;
}
continue;

if (MiscUtil.checkIfInt(data)) throw new ShowParseException("Legacy (1.12) numeric IDs are no longer supported. Please convert to modern names.");
head = new ItemStack(Material.valueOf(data)); // Get material
}
String[] l = st.split(":");
int id = Integer.parseInt(l[0]);
byte dam = l.length > 1 ? Byte.parseByte(l[1]) : 0;
ItemStack temp = new ItemStack(Material.getMaterial(ShowUtil.convertMaterialNoData(id).name()), 1, dam);
switch (i) {
case 1:
head = temp;
continue;
case 2:
chestplate = temp;
case 1: { // Chestplate

// Try to color leather armor
if (data.endsWith(")")) {
// Returns colored leather, or whatever item was passed in if not leather
chestplate = parseColoredArmor(data);
continue;
case 3:
leggings = temp;
}

if (MiscUtil.checkIfInt(data)) throw new ShowParseException("Legacy (1.12) numeric IDs are no longer supported. Please convert to modern names.");
chestplate = new ItemStack(Material.valueOf(data)); // Get material

}
case 2: { // Leggings

// Try to color leather armor
if (data.endsWith(")")) {
// Returns colored leather, or whatever item was passed in if not leather
leggings = parseColoredArmor(data);
continue;
case 4:
boots = temp;
}

if (MiscUtil.checkIfInt(data)) throw new ShowParseException("Legacy (1.12) numeric IDs are no longer supported. Please convert to modern names.");
leggings = new ItemStack(Material.valueOf(data)); // Get material
}
case 3: { // Boots

// Try to color leather armor
if (data.endsWith(")")) {
// Returns colored leather, or whatever item was passed in if not leather
boots = parseColoredArmor(data);
continue;
case 5:
itemInMainHand = temp;
}

if (MiscUtil.checkIfInt(data)) throw new ShowParseException("Legacy (1.12) numeric IDs are no longer supported. Please convert to modern names.");
boots = new ItemStack(Material.valueOf(data)); // Get material
}
case 4: { // Main Hand
if (MiscUtil.checkIfInt(data)) throw new ShowParseException("Legacy (1.12) numeric IDs are no longer supported. Please convert to modern names.");
itemInMainHand = new ItemStack(Material.valueOf(data)); // Get material
}
case 5: { // Off Hand
if (MiscUtil.checkIfInt(data)) throw new ShowParseException("Legacy (1.12) numeric IDs are no longer supported. Please convert to modern names.");
itemInOffHand = new ItemStack(Material.valueOf(data)); // Get material
}

}

}

return new ArmorData(head, chestplate, leggings, boots, itemInMainHand, itemInOffHand);
}

/**
* Tries to get a piece of leather armor with color values.
* @param data Armor and color data. Format: LEATHER_HELMET:data(r,g,b)
* @return Colored item
*/
private ItemStack parseColoredArmor(String data) throws Exception {
String colors = data.split(":")[1]; // should get "data(r,g,b)" or "(r,g,b)"
if (colors.toLowerCase().contains("data")) colors = colors.replaceFirst("data", ""); // should get "(r,g,b)"
colors = colors.replaceAll("\\)", "");
colors = colors.replaceAll("\\(", ""); // should get "r,g,b"

int red = Integer.parseInt(colors.split(",")[0]);
int green = Integer.parseInt(colors.split(",")[1]);
int blue = Integer.parseInt(colors.split(",")[2]);

if (MiscUtil.checkIfInt(data.split(":")[0])) throw new ShowParseException("Legacy (1.12) numeric IDs are no longer supported. Please convert to modern names.");
Material mat = Material.valueOf(data.split(":")[0]); // Get material

// If can't be colored, throw exception
if (!mat.toString().toLowerCase().contains("leather")) {
throw new ShowParseException("Material (" + mat + ") cannot be colored.");
}
return new ArmorData(head, chestplate, leggings, boots, itemInMainHand);

// Apply colors
ItemStack temp = new ItemStack(mat, 1);
LeatherArmorMeta lam = (LeatherArmorMeta) temp.getItemMeta();
lam.setColor(Color.fromRGB(red, green, blue));
temp.setItemMeta(lam);

return temp;
}

public List<UUID> getNearPlayers() {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/network/palace/show/actions/armor/ArmorStandSpawn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public void play(Player[] nearPlayers) {
if (data.getItemInMainHand() != null) {
armor.setItemInHand(data.getItemInMainHand());
}
if (data.getItemInOffHand() != null) {
armor.getEquipment().setItemInOffHand(data.getItemInOffHand());
}
}
stand.setStand(armor);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/network/palace/show/handlers/ArmorData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ public class ArmorData {
private ItemStack leggings;
private ItemStack boots;
private ItemStack itemInMainHand;
private ItemStack itemInOffHand;

@Override
public String toString() {
return head.toString() + " " + chestplate.toString() + " " + leggings.toString() + " " + boots.toString() + " " + itemInMainHand.toString();
return head.toString() + " " + chestplate.toString() + " " + leggings.toString() + " " + boots.toString() + " " + itemInMainHand.toString() + " " + itemInOffHand.toString();
}
}
3 changes: 3 additions & 0 deletions src/main/java/network/palace/show/utils/ShowUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
import network.palace.show.Show;
import network.palace.show.ShowPlugin;
import network.palace.show.exceptions.ShowParseException;
import network.palace.show.handlers.ArmorData;
import network.palace.show.handlers.BlockData;
import network.palace.show.handlers.TitleType;
import network.palace.show.sequence.ShowSequence;
import org.bukkit.*;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.material.MaterialData;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
Expand Down