aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2023-09-16 21:09:20 -0400
committerGitHub <noreply@github.com>2023-09-16 21:09:20 -0400
commit01ad5f7973121cf93997dfa2076492301c89bcd3 (patch)
tree70a87026160956bb7085a178cd0b2500475a8c47
parent8c88eb79c83b2ab33eb4b53759e41fc6d8170e8f (diff)
downloadSkyblocker-01ad5f7973121cf93997dfa2076492301c89bcd3.tar.gz
Skyblocker-01ad5f7973121cf93997dfa2076492301c89bcd3.tar.bz2
Skyblocker-01ad5f7973121cf93997dfa2076492301c89bcd3.zip
Fix jolly pink rocks (#315)
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java
index d420d54f..9808cfc7 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import me.xmrvizzy.skyblocker.utils.NEURepo;
+import net.minecraft.item.FireworkRocketItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.*;
import net.minecraft.text.Text;
@@ -89,6 +90,16 @@ public class ItemStackBuilder {
enchantments.add(new NbtCompound());
tag.put("Enchantments", enchantments);
}
+
+ // Add firework star color
+ Matcher explosionColorMatcher = Pattern.compile("\\{Explosion:\\{(?:Type:[0-9a-z]+,)?Colors:\\[(?<color>[0-9]+)\\]\\}").matcher(nbttag);
+ if (explosionColorMatcher.find()) {
+ NbtCompound explosion = new NbtCompound();
+
+ explosion.putInt("Type", FireworkRocketItem.Type.SMALL_BALL.getId()); //Forget about the actual ball type because it probably doesn't matter
+ explosion.putIntArray("Colors", new int[] { Integer.parseInt(explosionColorMatcher.group("color")) });
+ tag.put("Explosion", explosion);
+ }
return ItemStack.fromNbt(root);
}