diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.cs index c6559842..214151fc 100644 --- a/PCK-Studio/Forms/Editor/BehaviourEditor.cs +++ b/PCK-Studio/Forms/Editor/BehaviourEditor.cs @@ -28,13 +28,13 @@ namespace PckStudio.Forms.Editor { TreeNode EntryNode = new TreeNode(entry.name); - foreach (JObject content in Utilities.BehaviourResources.entityData["entities"].Children()) + foreach (JObject content in Utilities.BehaviourResources.entityData["behaviours"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == entry.name); if (prop is JProperty) { EntryNode.Text = (string)prop.Value; - EntryNode.ImageIndex = Utilities.BehaviourResources.entityData["entities"].Children().ToList().IndexOf(content); + EntryNode.ImageIndex = Utilities.BehaviourResources.entityData["behaviours"].Children().ToList().IndexOf(content); EntryNode.SelectedImageIndex = EntryNode.ImageIndex; break; } @@ -164,13 +164,13 @@ namespace PckStudio.Forms.Editor entry.name = diag.SelectedEntity; treeView1.SelectedNode.Tag = entry; - foreach (JObject content in Utilities.BehaviourResources.entityData["entities"].Children()) + foreach (JObject content in Utilities.BehaviourResources.entityData["behaviours"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == entry.name); if (prop is JProperty) { treeView1.SelectedNode.Text = (string)prop.Value; - treeView1.SelectedNode.ImageIndex = Utilities.BehaviourResources.entityData["entities"].Children().ToList().IndexOf(content); + treeView1.SelectedNode.ImageIndex = Utilities.BehaviourResources.entityData["behaviours"].Children().ToList().IndexOf(content); treeView1.SelectedNode.SelectedImageIndex = treeView1.SelectedNode.ImageIndex; break; } @@ -217,13 +217,13 @@ namespace PckStudio.Forms.Editor TreeNode NewOverrideNode = new TreeNode(NewOverride.name); NewOverrideNode.Tag = NewOverride; - foreach (JObject content in Utilities.BehaviourResources.entityData["entities"].Children()) + foreach (JObject content in Utilities.BehaviourResources.entityData["behaviours"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == NewOverride.name); if (prop is JProperty) { NewOverrideNode.Text = (string)prop.Value; - NewOverrideNode.ImageIndex = Utilities.BehaviourResources.entityData["entities"].Children().ToList().IndexOf(content); + NewOverrideNode.ImageIndex = Utilities.BehaviourResources.entityData["behaviours"].Children().ToList().IndexOf(content); NewOverrideNode.SelectedImageIndex = NewOverrideNode.ImageIndex; break; } diff --git a/PCK-Studio/Forms/Editor/MaterialsEditor.cs b/PCK-Studio/Forms/Editor/MaterialsEditor.cs index 83ceb106..33f421d5 100644 --- a/PCK-Studio/Forms/Editor/MaterialsEditor.cs +++ b/PCK-Studio/Forms/Editor/MaterialsEditor.cs @@ -15,7 +15,7 @@ namespace PckStudio.Forms.Editor { public partial class MaterialsEditor : MetroForm { - // Behaviours File Format research by Miku and MattNL + // Materials File Format research by PhoenixARC private readonly PckFile.FileData _file; MaterialContainer materialFile; @@ -27,13 +27,13 @@ namespace PckStudio.Forms.Editor { TreeNode EntryNode = new TreeNode(entry.Name); - foreach (JObject content in Utilities.MaterialResources.entityData["entities"].Children()) + foreach (JObject content in Utilities.MaterialResources.entityData["materials"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == entry.Name); if (prop is JProperty) { EntryNode.Text = (string)prop.Value; - EntryNode.ImageIndex = Utilities.MaterialResources.entityData["entities"].Children().ToList().IndexOf(content); + EntryNode.ImageIndex = Utilities.MaterialResources.entityData["materials"].Children().ToList().IndexOf(content); EntryNode.SelectedImageIndex = EntryNode.ImageIndex; break; } @@ -146,13 +146,13 @@ namespace PckStudio.Forms.Editor TreeNode NewEntryNode = new TreeNode(NewEntry.Name); NewEntryNode.Tag = NewEntry; - foreach (JObject content in Utilities.MaterialResources.entityData["entities"].Children()) + foreach (JObject content in Utilities.MaterialResources.entityData["materials"].Children()) { var prop = content.Properties().FirstOrDefault(prop => prop.Name == NewEntry.Name); if (prop is JProperty) { NewEntryNode.Text = (string)prop.Value; - NewEntryNode.ImageIndex = Utilities.MaterialResources.entityData["entities"].Children().ToList().IndexOf(content); + NewEntryNode.ImageIndex = Utilities.MaterialResources.entityData["materials"].Children().ToList().IndexOf(content); NewEntryNode.SelectedImageIndex = NewEntryNode.ImageIndex; break; } diff --git a/PCK-Studio/Forms/Utilities/BehaviourResources.cs b/PCK-Studio/Forms/Utilities/BehaviourResources.cs index 8eed8e50..36d295b8 100644 --- a/PCK-Studio/Forms/Utilities/BehaviourResources.cs +++ b/PCK-Studio/Forms/Utilities/BehaviourResources.cs @@ -12,7 +12,7 @@ namespace PckStudio.Forms.Utilities { public static class BehaviourResources { - public static readonly JObject entityData = JObject.Parse(Resources.entityBehaviourData); + public static readonly JObject entityData = JObject.Parse(Resources.entityData); private static Image[] _entityImages; public static Image[] entityImages => _entityImages ??= Resources.entities_sheet.CreateImageList(32).ToArray(); diff --git a/PCK-Studio/Forms/Utilities/MaterialResources.cs b/PCK-Studio/Forms/Utilities/MaterialResources.cs index 94cd2e4a..ccc1493d 100644 --- a/PCK-Studio/Forms/Utilities/MaterialResources.cs +++ b/PCK-Studio/Forms/Utilities/MaterialResources.cs @@ -14,7 +14,7 @@ namespace PckStudio.Forms.Utilities { public static class MaterialResources { - public static readonly JObject entityData = JObject.Parse(Resources.entityMaterialData); + public static readonly JObject entityData = JObject.Parse(Resources.entityData); private static Image[] _entityImages; public static Image[] entityImages => _entityImages ??= Resources.entities_sheet.CreateImageList(32).ToArray(); diff --git a/PCK-Studio/Forms/Utilities/ModelsResources.cs b/PCK-Studio/Forms/Utilities/ModelsResources.cs index f61e6ee1..47795210 100644 --- a/PCK-Studio/Forms/Utilities/ModelsResources.cs +++ b/PCK-Studio/Forms/Utilities/ModelsResources.cs @@ -13,7 +13,7 @@ namespace PckStudio.Forms.Utilities { public static class ModelsResources { - public static readonly JObject entityData = JObject.Parse(Resources.entityModelData); + public static readonly JObject entityData = JObject.Parse(Resources.entityData); private static Image[] _entityImages; public static Image[] entityImages => _entityImages ??= Resources.entities_sheet.CreateImageList(32).ToArray(); diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index cf4b9a7b..5aa04a91 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -658,6 +658,7 @@ + diff --git a/PCK-Studio/Properties/Resources.Designer.cs b/PCK-Studio/Properties/Resources.Designer.cs index 2a82dad2..7855d15b 100644 --- a/PCK-Studio/Properties/Resources.Designer.cs +++ b/PCK-Studio/Properties/Resources.Designer.cs @@ -285,64 +285,7 @@ namespace PckStudio.Properties { /// /// Looks up a localized string similar to { /// "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", - /// "entities": [ - /// { "area_effect_cloud": "Area Effect Cloud / Particle" }, - /// { "armor_stand": "Armor Stand" }, - /// { "arrow": "Arrow" }, - /// { "bat": "Bat" }, - /// { "blaze": "Blaze" }, - /// { "boat": "Boat" }, - /// { "cat": "Cat (PS4 EXCLUSIVE)" }, - /// { "cave_spider": "Cave Spider" }, - /// { "chest_minecart": "Chest Minecart" }, - /// { "chicken": "Chicken" }, - /// { "cod": "Cod" }, - /// { "commandblock_minecart": "Command Block Minecart" }, - /// { " [rest of string was truncated]";. - /// - public static string entityBehaviourData { - get { - return ResourceManager.GetString("entityBehaviourData", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to { - /// "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", - /// "entities": [ - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "bat": "Bat" }, - /// { "blaze_head": "Blaze (Head Only)" }, - /// { "": "" }, - /// { "cat": "Cat (PS4 EXCLUSIVE)" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "drowned": "Drowned" }, - /// { "": "" }, - /// { "": "" }, - /// { "": "" }, - /// { "ender_dragon": "Ender Dragon" }, [rest of string was truncated]";. - /// - public static string entityMaterialData { - get { - return ResourceManager.GetString("entityMaterialData", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to { - /// "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", - /// "entities": [ + /// "models": [ /// { "": "" }, /// { "": "" }, /// { "": "" }, @@ -363,11 +306,11 @@ namespace PckStudio.Properties { /// { "zombie.drowned": "Drowned" }, /// { "": "" }, /// { "": "" }, - /// [rest of string was truncated]";. + /// [rest of string was truncated]";. /// - public static string entityModelData { + public static string entityData { get { - return ResourceManager.GetString("entityModelData", resourceCulture); + return ResourceManager.GetString("entityData", resourceCulture); } } diff --git a/PCK-Studio/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx index 0960e852..124d7dcb 100644 --- a/PCK-Studio/Properties/Resources.resx +++ b/PCK-Studio/Properties/Resources.resx @@ -331,13 +331,7 @@ ..\Resources\entities.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\entityBehaviourData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\entityMaterialData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\entityModelData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\entityData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 \ No newline at end of file diff --git a/PCK-Studio/Resources/entityBehaviourData.json b/PCK-Studio/Resources/entityBehaviourData.json deleted file mode 100644 index 2a892c69..00000000 --- a/PCK-Studio/Resources/entityBehaviourData.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", - "entities": [ - { "area_effect_cloud": "Area Effect Cloud / Particle" }, - { "armor_stand": "Armor Stand" }, - { "arrow": "Arrow" }, - { "bat": "Bat" }, - { "blaze": "Blaze" }, - { "boat": "Boat" }, - { "cat": "Cat (PS4 EXCLUSIVE)" }, - { "cave_spider": "Cave Spider" }, - { "chest_minecart": "Chest Minecart" }, - { "chicken": "Chicken" }, - { "cod": "Cod" }, - { "commandblock_minecart": "Command Block Minecart" }, - { "cow": "Cow" }, - { "creeper": "Creeper" }, - { "dolphin": "Dolphin" }, - { "donkey": "Donkey" }, - { "dragon_fireball": "Dragon Fireball" }, - { "drowned": "Drowned" }, - { "egg": "Thrown Egg" }, - { "elder_guardian": "Elder Guardian" }, - { "ender_crystal": "End Crystal" }, - { "ender_dragon": "Ender Dragon" }, - { "ender_pearl": "Thrown Ender Pearl" }, - { "enderman": "Enderman" }, - { "endermite": "Endermite" }, - { "evocation_illager": "Evoker" }, - { "evocation_fangs": "Evoker Fangs" }, - { "xp_bottle": "Thrown Experience Bottle" }, - { "xp_orb": "Experience Orb" }, - { "eye_of_ender_signal": "Thrown Eye of Ender" }, - { "falling_block": "Falling Block" }, - { "fireball": "Fireball" }, - { "fireworks_rocket": "Firework Rocket" }, - { "furnace_minecart": "Furnace Minecart" }, - { "ghast": "Ghast" }, - { "giant": "Giant" }, - { "guardian": "Guardian" }, - { "hopper_minecart": "Hopper Minecart" }, - { "horse": "Horse" }, - { "husk": "Husk" }, - { "villager_golem": "Iron Golem" }, - { "item": "Dropped Item" }, - { "item_frame": "Item Frame" }, - { "leash_knot": "Lead Knot" }, - { "llama": "Llama" }, - { "llama_spit": "Llama Spit" }, - { "magma_cube": "Magma Cube" }, - { "minecart": "Minecart" }, - { "mooshroom": "Mooshroom" }, - { "mule": "Mule" }, - { "ocelot": "Ocelot" }, - { "painting": "Painting" }, - { "panda": "Panda (PS4 EXCLUSIVE)" }, - { "parrot": "Parrot" }, - { "phantom": "Phantom" }, - { "pig": "Pig" }, - { "pillager": "Pillager (PS4 EXCLUSIVE)" }, - { "polar_bear": "Polar Bear" }, - { "potion": "Thrown Potion" }, - { "pufferfish": "Pufferfish" }, - { "rabbit": "Rabbit" }, - { "ravager": "Ravager (PS4 EXCLUSIVE)" }, - { "salmon": "Salmon" }, - { "sheep": "Sheep" }, - { "shulker": "Shulker" }, - { "shulker_bullet": "Shulker Bullet" }, - { "silverfish": "Silverfish" }, - { "skeleton": "Skeleton" }, - { "skeleton_horse": "Skeleton Horse" }, - { "slime": "Slime" }, - { "small_fireball": "Small Fireball" }, - { "snowman": "Snow Golem" }, - { "snowball": "Thrown Snowball" }, - { "spawner_minecart": "Spawner Minecart" }, - { "spectral_arrow": "Spectral Arrow" }, - { "spider": "Spider" }, - { "squid": "Squid" }, - { "stray": "Stray" }, - { "tnt": "Primed TNT" }, - { "tnt_minecart": "TNT Minecart" }, - { "trident": "Thrown Trident" }, - { "tropical_fish": "Tropical Fish" }, - { "turtle": "Turtle" }, - { "vex": "Vex" }, - { "villager": "Villager" }, - { "vindication_illager": "Vindicator" }, - { "wandering_trader": "Wandering Trader (PS4 Exclusive)" }, - { "witch": "Witch" }, - { "wither": "Wither" }, - { "wither_skeleton": "Wither Skeleton" }, - { "wither_skull": "Wither Skull" }, - { "wolf": "Wolf" }, - { "zombie": "Zombie" }, - { "zombie_horse": "Zombie Horse" }, - { "zombie_pigman": "Zombie Pigman" }, - { "zombie_villager": "Zombie Villager" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" } - ] -} diff --git a/PCK-Studio/Resources/entityData.json b/PCK-Studio/Resources/entityData.json new file mode 100644 index 00000000..27621c86 --- /dev/null +++ b/PCK-Studio/Resources/entityData.json @@ -0,0 +1,369 @@ +{ + "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", + "models": [ + { "": "" }, + { "": "" }, + { "": "" }, + { "bat": "Bat" }, + { "blaze": "Blaze" }, + { "boat": "Boat" }, + { "cat": "Cat (PS4 EXCLUSIVE)" }, + { "": "" }, + { "": "" }, + { "chicken": "Chicken" }, + { "cod": "Cod" }, + { "": "" }, + { "cow": "Cow" }, + { "creeper": "Creeper" }, + { "dolphin": "Dolphin" }, + { "": "" }, + { "": "" }, + { "zombie.drowned": "Drowned" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "dragon": "Ender Dragon" }, + { "": "" }, + { "enderman": "Enderman" }, + { "endermite": "Endermite" }, + { "evoker": "Evoker" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "ghast": "Ghast" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "zombie.husk": "Husk" }, + { "irongolem": "Iron Golem" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "llama": "Llama" }, + { "": "" }, + { "lavaslime": "Magma Cube" }, + { "minecart": "Minecart" }, + { "mooshroom": "Mooshroom" }, + { "": "" }, + { "ocelot": "Ocelot" }, + { "": "" }, + { "panda": "Panda (PS4 EXCLUSIVE)" }, + { "parrot": "Parrot" }, + { "phantom": "Phantom" }, + { "pig": "Pig" }, + { "": "" }, + { "polarbear": "Polar Bear" }, + { "": "" }, + { "pufferfish.large": "Pufferfish (Large)" }, + { "rabbit": "Rabbit" }, + { "": "" }, + { "salmon": "Salmon" }, + { "": "" }, + { "shulker": "Shulker" }, + { "": "" }, + { "silverfish": "Silverfish" }, + { "skeleton": "Skeleton" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "snowgolem": "Snow Golem" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "squid": "Squid" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "trident": "Thrown Trident" }, + { "tropicalfish_a": "Tropical Fish (Small)" }, + { "turtle": "Turtle" }, + { "vex": "Vex" }, + { "villager": "Villager" }, + { "vindicator": "Vindicator/Illusioner" }, + { "": "" }, + { "witch": "Witch" }, + { "witherboss": "Wither" }, + { "skeleton.wither": "Wither Skeleton" }, + { "witherboss.armor": "Wither (Armor)" }, + { "wolf": "Wolf" }, + { "zombie": "Zombie" }, + { "": "" }, + { "pigzombie": "Zombie Pigman" }, + { "zombie.villager": "Zombie Villager" }, + { "skeleton_head": "Skeleton Skull" }, + { "skeleton_wither_head": "Wither Skeleton Skull" }, + { "zombie_head": "Zombie Head" }, + { "creeper_head": "Creeper Head" }, + { "dragon_head": "Ender Dragon Head" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "spider": "Spiders" }, + { "bed": "Bed" }, + { "guardian": "Guardians" }, + { "horse.v2": "Horses/Donky/Mule" }, + { "pufferfish.small": "Pufferfish (Small)" }, + { "pufferfish.mid": "Pufferfish (Medium)" }, + { "sheep.sheared": "Sheep (Without Fur)" }, + { "sheep": "Sheep (Fur Only)" }, + { "slime": "Slime (Inner)" }, + { "slime.armor": "Slime (Outer)" }, + { "skeleton.stray": "Stray" }, + { "stray.armor": "Stray (Overlay)" }, + { "tropicalfish_b": "Tropical Fish (Large)" } + ], + "materials": [ + { "": "" }, + { "": "" }, + { "": "" }, + { "bat": "Bat" }, + { "blaze_head": "Blaze (Head Only)" }, + { "": "" }, + { "cat": "Cat (PS4 EXCLUSIVE)" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "drowned": "Drowned" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "ender_dragon": "Ender Dragon" }, + { "": "" }, + { "enderman": "Enderman" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "ghast": "Ghast" }, + { "": "" }, + { "guardian": "Guardian" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "iron_golem": "Iron Golem" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "magma_cube": "Magma Cube" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "phantom": "Phantom" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "sheep": "Sheep" }, + { "shulker": "Shulker" }, + { "": "" }, + { "": "" }, + { "skeleton": "Skeleton" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "stray": "Stray" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "wither_boss": "Wither" }, + { "wither_skeleton": "Wither Skeleton" }, + { "": "" }, + { "wolf": "Wolf" }, + { "": "" }, + { "": "" }, + { "zombie_pigman": "Zombie Pigman" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "villager": "Villager (PS4 EXCLUSIVE)" }, + { "zombie_villager": "Villager (PS4 EXCLUSIVE)" }, + { "": "" }, + { "phantom_invisible": "Phantom (Second Layer)" }, + { "enderman_invisible": "Enderman (Second Layer)" }, + { "spider_invisible": "Spiders (Second Layer)" }, + { "spider": "Spiders" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" } + ], + "behaviours": [ + { "area_effect_cloud": "Area Effect Cloud / Particle" }, + { "armor_stand": "Armor Stand" }, + { "arrow": "Arrow" }, + { "bat": "Bat" }, + { "blaze": "Blaze" }, + { "boat": "Boat" }, + { "cat": "Cat (PS4 EXCLUSIVE)" }, + { "cave_spider": "Cave Spider" }, + { "chest_minecart": "Chest Minecart" }, + { "chicken": "Chicken" }, + { "cod": "Cod" }, + { "commandblock_minecart": "Command Block Minecart" }, + { "cow": "Cow" }, + { "creeper": "Creeper" }, + { "dolphin": "Dolphin" }, + { "donkey": "Donkey" }, + { "dragon_fireball": "Dragon Fireball" }, + { "drowned": "Drowned" }, + { "egg": "Thrown Egg" }, + { "elder_guardian": "Elder Guardian" }, + { "ender_crystal": "End Crystal" }, + { "ender_dragon": "Ender Dragon" }, + { "ender_pearl": "Thrown Ender Pearl" }, + { "enderman": "Enderman" }, + { "endermite": "Endermite" }, + { "evocation_illager": "Evoker" }, + { "evocation_fangs": "Evoker Fangs" }, + { "xp_bottle": "Thrown Experience Bottle" }, + { "xp_orb": "Experience Orb" }, + { "eye_of_ender_signal": "Thrown Eye of Ender" }, + { "falling_block": "Falling Block" }, + { "fireball": "Fireball" }, + { "fireworks_rocket": "Firework Rocket" }, + { "furnace_minecart": "Furnace Minecart" }, + { "ghast": "Ghast" }, + { "giant": "Giant" }, + { "guardian": "Guardian" }, + { "hopper_minecart": "Hopper Minecart" }, + { "horse": "Horse" }, + { "husk": "Husk" }, + { "villager_golem": "Iron Golem" }, + { "item": "Dropped Item" }, + { "item_frame": "Item Frame" }, + { "leash_knot": "Lead Knot" }, + { "llama": "Llama" }, + { "llama_spit": "Llama Spit" }, + { "magma_cube": "Magma Cube" }, + { "minecart": "Minecart" }, + { "mooshroom": "Mooshroom" }, + { "mule": "Mule" }, + { "ocelot": "Ocelot" }, + { "painting": "Painting" }, + { "panda": "Panda (PS4 EXCLUSIVE)" }, + { "parrot": "Parrot" }, + { "phantom": "Phantom" }, + { "pig": "Pig" }, + { "pillager": "Pillager (PS4 EXCLUSIVE)" }, + { "polar_bear": "Polar Bear" }, + { "potion": "Thrown Potion" }, + { "pufferfish": "Pufferfish" }, + { "rabbit": "Rabbit" }, + { "ravager": "Ravager (PS4 EXCLUSIVE)" }, + { "salmon": "Salmon" }, + { "sheep": "Sheep" }, + { "shulker": "Shulker" }, + { "shulker_bullet": "Shulker Bullet" }, + { "silverfish": "Silverfish" }, + { "skeleton": "Skeleton" }, + { "skeleton_horse": "Skeleton Horse" }, + { "slime": "Slime" }, + { "small_fireball": "Small Fireball" }, + { "snowman": "Snow Golem" }, + { "snowball": "Thrown Snowball" }, + { "spawner_minecart": "Spawner Minecart" }, + { "spectral_arrow": "Spectral Arrow" }, + { "spider": "Spider" }, + { "squid": "Squid" }, + { "stray": "Stray" }, + { "tnt": "Primed TNT" }, + { "tnt_minecart": "TNT Minecart" }, + { "trident": "Thrown Trident" }, + { "tropical_fish": "Tropical Fish" }, + { "turtle": "Turtle" }, + { "vex": "Vex" }, + { "villager": "Villager" }, + { "vindication_illager": "Vindicator" }, + { "wandering_trader": "Wandering Trader (PS4 Exclusive)" }, + { "witch": "Witch" }, + { "wither": "Wither" }, + { "wither_skeleton": "Wither Skeleton" }, + { "wither_skull": "Wither Skull" }, + { "wolf": "Wolf" }, + { "zombie": "Zombie" }, + { "zombie_horse": "Zombie Horse" }, + { "zombie_pigman": "Zombie Pigman" }, + { "zombie_villager": "Zombie Villager" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" } + ] +} diff --git a/PCK-Studio/Resources/entityMaterialData.json b/PCK-Studio/Resources/entityMaterialData.json deleted file mode 100644 index 6597882f..00000000 --- a/PCK-Studio/Resources/entityMaterialData.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", - "entities": [ - { "": "" }, - { "": "" }, - { "": "" }, - { "bat": "Bat" }, - { "blaze_head": "Blaze (Head Only)" }, - { "": "" }, - { "cat": "Cat (PS4 EXCLUSIVE)" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "drowned": "Drowned" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "ender_dragon": "Ender Dragon" }, - { "": "" }, - { "enderman": "Enderman" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "ghast": "Ghast" }, - { "": "" }, - { "guardian": "Guardian" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "iron_golem": "Iron Golem" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "magma_cube": "Magma Cube" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "phantom": "Phantom" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "sheep": "Sheep" }, - { "shulker": "Shulker" }, - { "": "" }, - { "": "" }, - { "skeleton": "Skeleton" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "stray": "Stray" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "wither_boss": "Wither" }, - { "wither_skeleton": "Wither Skeleton" }, - { "": "" }, - { "wolf": "Wolf" }, - { "": "" }, - { "": "" }, - { "zombie_pigman": "Zombie Pigman" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "villager": "Villager (PS4 EXCLUSIVE)" }, - { "zombie_villager": "Villager (PS4 EXCLUSIVE)" }, - { "": "" }, - { "phantom_invisible": "Phantom (Second Layer)" }, - { "enderman_invisible": "Enderman (Second Layer)" }, - { "spider_invisible": "Spiders (Second Layer)" }, - { "spider": "Spiders" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" } - ] -} diff --git a/PCK-Studio/Resources/entityModelData.json b/PCK-Studio/Resources/entityModelData.json deleted file mode 100644 index 93a9255d..00000000 --- a/PCK-Studio/Resources/entityModelData.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", - "entities": [ - { "": "" }, - { "": "" }, - { "": "" }, - { "bat": "Bat" }, - { "blaze": "Blaze" }, - { "boat": "Boat" }, - { "cat": "Cat (PS4 EXCLUSIVE)" }, - { "": "" }, - { "": "" }, - { "chicken": "Chicken" }, - { "cod": "Cod" }, - { "": "" }, - { "cow": "Cow" }, - { "creeper": "Creeper" }, - { "dolphin": "Dolphin" }, - { "": "" }, - { "": "" }, - { "zombie.drowned": "Drowned" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "dragon": "Ender Dragon" }, - { "": "" }, - { "enderman": "Enderman" }, - { "endermite": "Endermite" }, - { "evoker": "Evoker" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "ghast": "Ghast" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "zombie.husk": "Husk" }, - { "irongolem": "Iron Golem" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "llama": "Llama" }, - { "": "" }, - { "lavaslime": "Magma Cube" }, - { "minecart": "Minecart" }, - { "mooshroom": "Mooshroom" }, - { "": "" }, - { "ocelot": "Ocelot" }, - { "": "" }, - { "panda": "Panda (PS4 EXCLUSIVE)" }, - { "parrot": "Parrot" }, - { "phantom": "Phantom" }, - { "pig": "Pig" }, - { "": "" }, - { "polarbear": "Polar Bear" }, - { "": "" }, - { "pufferfish.large": "Pufferfish (Large)" }, - { "rabbit": "Rabbit" }, - { "": "" }, - { "salmon": "Salmon" }, - { "": "" }, - { "shulker": "Shulker" }, - { "": "" }, - { "silverfish": "Silverfish" }, - { "skeleton": "Skeleton" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "snowgolem": "Snow Golem" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "squid": "Squid" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "trident": "Thrown Trident" }, - { "tropicalfish_a": "Tropical Fish (Small)" }, - { "turtle": "Turtle" }, - { "vex": "Vex" }, - { "villager": "Villager" }, - { "vindicator": "Vindicator/Illusioner" }, - { "": "" }, - { "witch": "Witch" }, - { "witherboss": "Wither" }, - { "skeleton.wither": "Wither Skeleton" }, - { "witherboss.armor": "Wither (Armor)" }, - { "wolf": "Wolf" }, - { "zombie": "Zombie" }, - { "": "" }, - { "pigzombie": "Zombie Pigman" }, - { "zombie.villager": "Zombie Villager" }, - { "skeleton_head": "Skeleton Skull" }, - { "skeleton_wither_head": "Wither Skeleton Skull" }, - { "zombie_head": "Zombie Head" }, - { "creeper_head": "Creeper Head" }, - { "dragon_head": "Ender Dragon Head" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "spider": "Spiders" }, - { "bed": "Bed" }, - { "guardian": "Guardians" }, - { "horse.v2": "Horses/Donky/Mule" }, - { "pufferfish.small": "Pufferfish (Small)" }, - { "pufferfish.mid": "Pufferfish (Medium)" }, - { "sheep.sheared": "Sheep (Without Fur)" }, - { "sheep": "Sheep (Fur Only)" }, - { "slime": "Slime (Inner)" }, - { "slime.armor": "Slime (Outer)" }, - { "skeleton.stray": "Stray" }, - { "stray.armor": "Stray (Overlay)" }, - { "tropicalfish_b": "Tropical Fish (Large)" } - ] -}