From 1b77e1c89f2678fc5e78127e32b102fc0b13cd53 Mon Sep 17 00:00:00 2001
From: Myles <mylescomputer@gmail.com>
Date: Thu, 10 Mar 2016 14:07:27 +0000
Subject: [PATCH] Fix BarAPI, (adds new metaindex, and change colour to be
 right and remove debug)

---
 src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java | 8 ++++++--
 .../ViaVersion/transformers/OutgoingTransformer.java      | 7 +++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java b/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java
index 6d8c90a91..06685b875 100644
--- a/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java
+++ b/src/main/java/us/myles/ViaVersion/metadata/MetaIndex.java
@@ -92,6 +92,7 @@ public enum MetaIndex {
     WITHER_TARGET3(Wither.class, 19, Type.Int, 13, NewType.VarInt),
     WITHER_INVULN_TIME(Wither.class, 20, Type.Int, 14, NewType.VarInt),
     WITHER_PROPERTIES(Wither.class, 10, Type.Byte, NewType.Byte),
+    WITHER_UNKNOWN(Wither.class, 11, Type.Byte, NewType.Discontinued),
     // wither skull
     WITHERSKULL_INVULN(WitherSkull.class, 10, Type.Byte, 5, NewType.Boolean),
     // guardian
@@ -125,9 +126,12 @@ public enum MetaIndex {
     ITEMFRAME_ROTATION(ItemFrame.class, 9, Type.Byte, 6, NewType.VarInt),
     // ender crystal
     ENDERCRYSTAL_HEALTH(EnderCrystal.class, 8, Type.Int, NewType.Discontinued),
-    // Ender dragon
+    // Ender dragon boss bar issues
+    ENDERDRAGON_UNKNOWN(EnderDragon.class, 5, Type.Byte, NewType.Discontinued),
+    ENDERDRAGON_NAME(EnderDragon.class, 10, Type.String, NewType.Discontinued),
+    // Normal Ender dragon
     ENDERDRAGON_FLAG(EnderDragon.class, 15, Type.Byte, NewType.Discontinued),
-    ENDERDRAGON_PHASE(EnderDragon.class, 11, Type.Int, NewType.VarInt);
+    ENDERDRAGON_PHASE(EnderDragon.class, 11, Type.Byte, NewType.VarInt);
 
     private Class<?> clazz;
     private int newIndex;
diff --git a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
index 0ff2ebdc7..d71205965 100644
--- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
+++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
@@ -850,7 +850,7 @@ public class OutgoingTransformer {
         }
         // Fix: Dragon (crash fix)
         if(type == EntityType.ENDER_DRAGON) {
-            list.add(new Entry(MetaIndex.ENDERDRAGON_PHASE, 0, 11));
+            list.add(new Entry(MetaIndex.ENDERDRAGON_PHASE, (byte) 0, 11));
         }
         MetadataRewriter.writeMetadata1_9(type, list, output);
     }
@@ -904,7 +904,7 @@ public class OutgoingTransformer {
                     String title = (String) entry.getValue();
                     title = title.isEmpty() ? (type == EntityType.ENDER_DRAGON ? "Ender Dragon" : "Wither") : title;
                     if (bar == null) {
-                        bar = ViaVersion.getInstance().createBossBar(title, BossColor.PURPLE, BossStyle.SOLID);
+                        bar = ViaVersion.getInstance().createBossBar(title, BossColor.PINK, BossStyle.SOLID);
                         bossBarMap.put(entityID, bar);
                         bar.addPlayer(info.getPlayer());
                         bar.show();
@@ -916,10 +916,9 @@ public class OutgoingTransformer {
                     // Make health range between 0 and 1
                     float maxHealth = type == EntityType.ENDER_DRAGON ? 200.0f : 300.0f;
                     float health = Math.max(0.0f, Math.min(((float) entry.getValue()) / maxHealth, 1.0f));
-                    System.out.println(health + " " + entry.getValue());
                     if (bar == null) {
                         String title = type == EntityType.ENDER_DRAGON ? "Ender Dragon" : "Wither";
-                        bar = ViaVersion.getInstance().createBossBar(title, health, BossColor.PURPLE, BossStyle.SOLID);
+                        bar = ViaVersion.getInstance().createBossBar(title, health, BossColor.PINK, BossStyle.SOLID);
                         bossBarMap.put(entityID, bar);
                         bar.addPlayer(info.getPlayer());
                         bar.show();