Reorganize how data is stored, add even more data

mcinfo/data/nbt/base/minecart.json

@@ -0,0 +1,10 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Tags common to all minecarts",
+  "content": {
+    "CustomDisplayTile": "Byte Whether to display the custom tile in this minecart",
+    "DisplayTile": "String The ID of the custom block in the minecart",
+    "DisplayData": "Int Data value of the custom block in the minecart",
+    "DisplayOffset": "Int The offset of the block displayed in the minecart in pixels. Positive values move up, negative values move down."
+  }
+}

mcinfo/data/nbt/entity/area_effect_cloud.json

@@ -0,0 +1,37 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity"],
+  "content": {
+    "Age": "Int Age of the field",
+    "Color": "Int Color of the displayed particle.",
+    "Duration": "Int Maximum age of the field. Field dissipated at this age, regardless of radius.",
+    "ReapplicationDelay": "Int Number of ticks before reapplying the effect.",
+    "WaitTime": "Int Time before deploying the field. Doesn't apply the effect until age is >= this.",
+    "OwnerUUIDMost": "Long UUIDMost of the owner.",
+    "OwnerUUIDLeast": "Long UUIDLeast of the owner.",
+    "DurationOnUse": "Float Unknown. Does not effect age or duration.",
+    "Radius": "Float The area's radius.",
+    "RadiusOnUse": "Float Amount the radius grown upon applying the effect. Usually negative.",
+    "RadiusPerTick": "Float Amount the radius grows per tick. Usually negative.",
+    "Particle": "String The particle displayed by the area effect.",
+    "ParticleParam1": "Int For blockdust, blockcrack and fallingdust particles, specifies a numeric block id and a data value, using a single number: id+(data*4096). For iconcrack, specifies a block or item id.",
+    "ParticleParam2": "Int For iconcrack, specifies a data value.",
+    "Potion": "The name of the default potion effect.",
+    "Effects": {
+      "type": "TAG_List",
+      "desc": "A list of the applied effects.",
+      "content": {
+        "type": "TAG_Compound",
+        "desc": "An individual effect.",
+        "content": {
+          "Ambient": "Byte Reduced particle display",
+          "Amplifier": "Potion level",
+          "Id": "Potion id",
+          "ShowParticles": "particle display",
+          "Duration": "effect duration, 0 if instant."
+        }
+      }
+    }
+  }
+}

mcinfo/data/nbt/entity/arrow.json

@@ -0,0 +1,32 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity", "base.projectile"],
+  "content": {
+    "shake": "Byte The 'shake' when arrows hit a block.",
+    "inData": "Byte Metadata of the tile the arrow is in.",
+    "pickup": "Byte 0: can't be picked up by players, 1: can be picked up in survival and creative, 2: can only be picked up by players in creative",
+    "player": "Byte If pickup is not used, and this is true, the arrow can be picked up by players.",
+    "life": "Short Increments each tick when the arrow isn't moving, when it reaches 1200 the arrow despawns.",
+    "damage": "Double Damage dealt by the arrow.",
+    "inGround": "Byte If the projectile is in the ground.",
+    "crit": "Byte Whether the arrow will deal critical damage.",
+    "Color": "Int The color of this tipped arrow, if its item form had a custom color.",
+    "CustomPotionEffects": {
+      "type": "TAG_List",
+      "desc": "List of potion effects this tipped arrow has.",
+      "content": {
+        "type": "TAG_Compound",
+        "desc": "A single effect.",
+        "content": {
+          "Id": "Byte The numberic ID of the potion effect.",
+          "Amplifier": "Byte The amplifierof the effect. 0 is level 1",
+          "Duration": "Int The duration of the effect in ticks.",
+          "Ambient": "Byte Whether to show less intrusive particles.",
+          "ShowParticles": "Byte Whether to show particles for this effect."
+        }
+      }
+    },
+    "Potion": "String The name of the potion this tipped arrow has. This is different from the status effect name"
+  }
+}

mcinfo/data/nbt/bat.json → mcinfo/data/nbt/entity/bat.json

@@ -7,5 +7,5 @@
       "desc": "1 when hanging from block, 0 when flying."
     }
   },
-  "includes": ["entity", "mob"]
+  "includes": ["base.entity", "base.mob"]
 }

mcinfo/data/nbt/blaze.json → mcinfo/data/nbt/entity/blaze.json

@@ -1,5 +1,5 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"]
+  "includes": ["base.entity", "base.mob"]
 }

mcinfo/data/nbt/entity/boat.json

@@ -0,0 +1,8 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity"],
+  "content": {
+    "Type": "String The wood type of the boat. oak, spruce, birch, ..."
+  }
+}

mcinfo/data/nbt/cave_spider.json → mcinfo/data/nbt/entity/cave_spider.json

@@ -1,5 +1,5 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"]
+  "includes": ["base.entity", "base.mob"]
 }

mcinfo/data/nbt/entity/chest_minecart.json

@@ -0,0 +1,18 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity", "base.minecart"],
+  "content": {
+    "Items": {
+      "type": "TAG_List",
+      "desc": "List of items",
+      "content": {
+        "type": "TAG_Compound",
+        "desc": "An item, including the Slot tag.",
+        "includes": ["base:item"]
+      }
+    },
+    "LootTable": "String Loot table used to fill the chest when it is next opened.",
+    "LootTableSeed": "Long Seed for generating the loot table."
+  }
+}

mcinfo/data/nbt/chicken.json → mcinfo/data/nbt/entity/chicken.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob", "breedable"],
+  "includes": ["base.entity", "base.mob", "base.breedable"],
   "content": {
     "IsChickenJockey": {
       "type": "TAG_Byte",

mcinfo/data/nbt/entity/commandblock_minecart.json

@@ -0,0 +1,11 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity", "base.minecart"],
+  "content": {
+    "Command": "String The command of this command block minecart.",
+    "SuccessCount": "Int Represents the strength of the analog signal output by redstone comparators attached to this minecart. Only updated when the minecart is activated.",
+    "LastOutput": "String The last line of output generated by the minecart. Still stored even if the gamerule commandBlockOutput is false.",
+    "TrackOutput": "Byte Whether the LastOutput will be stored."
+  }
+}

mcinfo/data/nbt/entity/cow.json

@@ -0,0 +1,5 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity", "base.mob", "base.breedable"]
+}

mcinfo/data/nbt/creeper.json → mcinfo/data/nbt/entity/creeper.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"],
+  "includes": ["base.entity", "base.mob"],
   "content": {
     "powered": {
       "type": "TAG_Byte",

mcinfo/data/nbt/donkey.json → mcinfo/data/nbt/entity/donkey.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob", "breedable", "horselike"],
+  "includes": ["base.entity", "base.mob", "base.breedable", "base.horselike"],
   "content": {
     "ChestedHorse": {
       "type": "TAG_Byte",

mcinfo/data/nbt/entity/dragon_fireball.json

@@ -0,0 +1,18 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity"],
+  "content": {
+    "direction": {
+      "type": "TAG_List",
+      "desc": "Should be identical to Motion.",
+      "content": "Double The X, Y or Z motion."
+    },
+    "life": "Int Increments each tick when the projectile is not moving, resets to 0 if it moves. Not used but still saved/read",
+    "power": {
+      "type": "TAG_List",
+      "desc": "Like direction but without resistance",
+      "content": "Double The X, Y or Z motion without resistance"
+    }
+  }
+}

mcinfo/data/nbt/entity/egg.json

@@ -0,0 +1,9 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity", "base.projectile"],
+  "content": {
+    "shake": "Byte The shake when arrows hit a block.",
+    "ownerName": "String The name of the player this projectile was thrown by."
+  }
+}

mcinfo/data/nbt/elder_guardian.json → mcinfo/data/nbt/entity/elder_guardian.json

@@ -1,5 +1,5 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"]
+  "includes": ["base.entity", "base.mob"]
 }

mcinfo/data/nbt/ender_dragon.json → mcinfo/data/nbt/entity/ender_dragon.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"],
+  "includes": ["base.entity", "base.mob"],
   "content": {
     "DragonPhase": {
       "type": "TAG_Int",

mcinfo/data/nbt/entity/ender_pearl.json

@@ -0,0 +1,9 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity", "base.projectile"],
+  "content": {
+    "shake": "Byte The shake when arrows hit a block.",
+    "ownerName": "String The name of the player this projectile was thrown by."
+  }
+}

mcinfo/data/nbt/enderman.json → mcinfo/data/nbt/entity/enderman.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"],
+  "includes": ["base.entity", "base.mob"],
   "content": {
     "carried": {
       "type": "TAG_Short",

mcinfo/data/nbt/endermite.json → mcinfo/data/nbt/entity/endermite.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"],
+  "includes": ["base.entity", "base.mob"],
   "content": {
     "Lifetime": {
       "type": "TAG_Int",

mcinfo/data/nbt/evocation_illager.json → mcinfo/data/nbt/entity/evocation_illager.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"],
+  "includes": ["base.entity", "base.mob"],
   "content": {
     "SpellTicks": {
       "type": "TAG_Int",

mcinfo/data/nbt/entity/falling_block.json

@@ -0,0 +1,15 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity"],
+  "content": {
+    "Block": "String The Block ID of the falling block.",
+    "TileEntityData": "Compound The tags of the tile entity of this falling block.",
+    "Data": "Byte The data value for the block.",
+    "Time": "Int The number of ticks the entity has existed. If this goes above 600, the entity is deleted.",
+    "DropItem": "Byte Whether the block should drop has an item when it breaks.",
+    "HurtEntites": "Byte Whether the block should hurt entities it falls on.",
+    "FallHurtMax": "Int Maximum number of hitpoints of damage to inflict on entities that intersect this falling_block. In vanilla always 40",
+    "FallHurtAmount": "Float Multiplied by FallDistance to calculate amount if damage to inflict. For vanilla always 2."
+  }
+}

mcinfo/data/nbt/entity/fireball.json

@@ -0,0 +1,19 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity"],
+  "content": {
+    "direction": {
+      "type": "TAG_List",
+      "desc": "Should be identical to Motion.",
+      "content": "Double The X, Y or Z motion."
+    },
+    "life": "Int Increments each tick when the projectile is not moving, resets to 0 if it moves. Not used but still saved/read",
+    "power": {
+      "type": "TAG_List",
+      "desc": "Like direction but without resistance",
+      "content": "Double The X, Y or Z motion without resistance"
+    },
+    "ExplosionPower": "Int The power of the explosion created by the fireball upon impact."
+  }
+}

mcinfo/data/nbt/entity/furnace_minecart.json

@@ -0,0 +1,10 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity", "base.minecart"],
+  "content": {
+    "PushX": "Double Force along X axis.",
+    "PushZ": "Double Force along Z axis.",
+    "Fuel": "Short Number of ticks until the minecart runs out of fuel."
+  }
+}

mcinfo/data/nbt/ghast.json → mcinfo/data/nbt/entity/ghast.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"],
+  "includes": ["base.entity", "base.mob"],
   "content": {
     "ExplosionPower": {
       "type": "TAG_Int",

mcinfo/data/nbt/giant.json → mcinfo/data/nbt/entity/giant.json

@@ -1,5 +1,5 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"]
+  "includes": ["base.entity", "base.mob"]
 }

mcinfo/data/nbt/guardian.json → mcinfo/data/nbt/entity/guardian.json

@@ -1,5 +1,5 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"]
+  "includes": ["base.entity", "base.mob"]
 }

mcinfo/data/nbt/entity/hopper_minecart.json

@@ -0,0 +1,20 @@
+{
+  "type": "TAG_Compound",
+  "desc": "Entity data",
+  "includes": ["base.entity", "base.minecart"],
+  "content": {
+    "Items": {
+      "type": "TAG_List",
+      "desc": "List of items.",
+      "content": {
+        "type": "TAG_Compound",
+        "desc": "An item including the Slot tag.",
+        "includes": ["base:item"]
+      }
+    },
+    "TransferCooldown": "Int Time until next transfer in ticks.",
+    "Enabled": "Byte Whether or not the minecart hopper will pick up items.",
+    "LootTable": "String Loot table used to fill the hopper minecart when it is next opened.",
+    "LootTableSeed": "Long Seed for generating the loot table."
+  }
+}

mcinfo/data/nbt/horse.json → mcinfo/data/nbt/entity/horse.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob", "breedable", "horselike"],
+  "includes": ["base.entity", "base.mob", "base.breedable", "base.horselike"],
   "content": {
     "Variant": {
       "type": "TAG_Int",

mcinfo/data/nbt/husk.json → mcinfo/data/nbt/entity/husk.json

@@ -1,7 +1,7 @@
 {
   "type": "TAG_Compound",
   "desc": "Entity data",
-  "includes": ["entity", "mob"],
+  "includes": ["base.entity", "base.mob"],
   "content": {
     "IsBaby": {
       "type": "TAG_Byte",